mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:53:15 +00:00
21c98793d3
- Bug 1244883 - Add Nightly-/Aurora-only crash for AsyncTransactionWaiter timeouts - r=nical (132b2ceff9) - Bug 1148978 - Trigger paints when moving plugin windows around on the browser main thread. r=mattwoodrow (c75ce5ec09) - Dedent some functions. (bug 1254899 part 1, r=jrmuizel) (c84fb419c7) - Refactor acceleration pref initialization. (bug 1254899 part 2, r=jrmuizel) (29a164c70e) - Remove NS_NATIVE_GRAPHIC on Windows. (bug 1266536, r=jimm) (84011349d1) - Bug 1267253 - Delete gfxWindowsPlatform::RenderMode and replace it with a check against the default backend. r=bas (93cb6e503e) - Introduce gfxConfig, a manager for graphics feature settings. (bug 1254899 part 3, r=milan) (97498ca46a) - Bug 1262187: Allow D3D9 if D3D11 failed, behind the pref, but on by default. r=bas (8163e28b26) - Bug 1178376 - Optionally fade in new progressively painted tiles r=nical (777bf1799d) - Bug 1178376 - Allow progressive painting when low-precision tiles are disabled r=BenWa (3b8d84e19c) - Bug 1178376 - Put progressive paint status in tile updates r=nical (935d3b46ed) - Bug 1251778: Attempt to avoid presenting when the window is still resizing. r=jrmuizel (32b194a6f7) - Hoist mWidget into the Compositor base class. (bug 1264545 part 1, r=nical) (aca26ec343) - Lift compositor-accessed methods from nsIWidget into CompositorWidgetProxy. (bug 1264545 part 2, r=jimm) (609a23157a) - Rename FeatureStatus::Crashed to CrashedInHandler. (bug 1254899 part 4, r=milan) (0eae23a3fd) - Move DeviceInitData from gfxWindowsPlatform to gfxPlatforn. (bug 1254899 part 5, r=milan) (e31540ba18) - Merge gfxWindowsPlatform::mAcceleration into gfxConfig. (bug 1254899 part 6, r=milan) (9d45cc8b87) - Add another feature state for blacklisting and environment decisions. (bug 1254899 part 7, r=milan) (e7eee53cfb) - Give FeatureState a public interface. (bug 1254899 part 8, r=milan) (52d8e7f355) - Replace gfxWindowsPlatform::mD3D11Status with gfxConfig. (bug 1254899 part 9, r=jrmuizel) (90dc658b53) - Replace gfxWindowsPlatform::mD2D1Status with gfxConfig. (bug 1254899 part 10, r=milan) (eb9474f309) - Fix assertion failure in gfxConfig. (bug 1269565, r=milan) (0eb738ce66) - Add gfxConfig to nsIGfxInfo, for about:support access. (bug 1254899 part 11, r=jrmuizel) (e770240152) - Change Compositor::GetWidget to return a CompositorWidgetProxy. (bug 1264545 part 3, r=jimm) (fdf1d96255) - Bug 1251778 - Followup: Remove unreferenced local variable. r=bustage (27579f5542) - Use CompositorWidgetProxy in place of nsIWidget in the compositor. (bug 1264545 part 4, r=jimm) (80def1c2eb) - Use CompositorWidgetProxy in place of nsIWidget in CompositorBridgeParent. (bug 1264545 part 5, r=jimm,kats) (67d0e1ef7d) - Move CompositorWidgetProxy inheritance out of nsIWidget. (bug 1264545 part 6, r=jimm) (61075722c5) - Bug 1251894 - In CompositorD3D11::CreateTexture, copy as much as the render target allows. r=bas (bf5fc6baa2) - Bug 1266444: It is OK for us not to have texture sharing. r=jrmuizel (0b1885f89d) - Bug 1266396 - Make TextureClient more robust against racy shutdown situations. r=Bas (b1d7f54643) - Fix test bustage due to platform line-endings. Bug 1222624 (10b8cf3592) - More test bustage from bug 1222624 (763c4c0bb9) - Backed out 4 changesets (bug 1222624) to fix bug 1249572 (7ba3d433d0) - Bug 1268230 - RunTime.cpp and ScriptLoader do not have to use MainThreadStopSyncLoopRunnable, r=khuey (88499a3982) - Bug 1037725 - Add warning message in the console when worker spawn over limit. r=khuey (8af94dbc1d) - Bug 1047663 - Disabling the cache in a tab should also disable it for all workers in that tab;r=khuey (5411d81682) - Bug 1253793 Update ScriptLoader assertion to handle cancelation case. r=khuey (18c78d5651) - Bug 1245768 - Implement a test for the correct error management when worker imports 3rd party scripts, r=bz (c1d3f290a9) - Bug 1249673. Muted errors should be turned into NetworkError DOMExceptions when returning from importScripts on workers, instead of becoming NS_ERROR_FAILURE. r=baku (0358282cbe) - Bug 1265405 - Add a dictionary to specify how PeriodicWave should be normalized (or not); r=smaug …normalized (or not); r=smaugu (201213146c) - Bug 1251082. Restore comments in PageTransitionEvent.webidl that got lost when nsIDOMPageTransitionEvent.idl was migrated to webidl. r=bz The mentioned migration happened in http://hg.mozilla.org/mozilla-central/rev/e6377ca32f3d from bug 1031051. (2dfa309056) - Bug 1266178 Make ServiceWorkerClient not assert if the document doesn't have an outer window. r=ehsan (eafb169c91) - Bug 1259164 - Set ServiceWorkerMessageEvent.origin correctly when calling ServiceWorkerClient.postMessage(); r=bkelly (caeb65d10e) - Bug 1246319 P1 Dedupe service worker registrar entries. r=baku (b76deef941) - Bug 1246319 P2 Verify entries are deduped from the ServiceWorkerRegistrar. r=baku (8a4e348d6e) - Bug 1246319 P3 Fix service worker registry value update. r=bz (14abf6b6ce) - Bug 1247970 - Remove principal spec from service worker registrar file. r=baku (3c30130700) - Bug 1249438 P1 Move guts of RegisterServiceWorker() into a protected method that can be tested in gtest. r=baku (488243196d) - Bug 1249438 P2 Modify existing gtest to use RegisterServiceWorkerInternal. r=baku (e86c66891d) - Bug 1249438 P3 Add a gtest that registers duplicate service worker registrations. r=baku (35e269f9af) - Bug 1226443 P6 Ignore update() called during top level service worker script evaluation. r=ehsan (dcb9d02553) - Bug 1241725 - about:serviceworkers "Active Cache Name" UUID should not contain null bytes, r=bkelly (4cddea6a67) - Bug 1221852 - SharedWorker.port should be always not null, r=smaug (a9800274dc) - Bug 1261428: Clean up a bit more. r=bz (4977e3d7a5) - Bug 890284. Stop splitting textnodes in the XML content sink. r=peterv (a46dfca1cf) - Bug 1211708 Allow themes to specify XBL bindings even in unprivileged documents r=sicking (82cf1a4023) - Bug 915962 - Part 1: Allow pressing space to scroll the document if an editable element or form control is not focused; r=roc (cdb934af03) - Bug 915962 - Part 2: Add a test case for pressing space when a tabindex=-1 and a button element is focused; r=roc (17dcf5cfd0) - Bug 915962 - Part 3: Do not crash when pressing the space bar without having an element focused; r=roc (2161e62bc3) - Bug 1180761, cancel the event earlier so that space doesn't trigger checkbox change and scroll, r=neil (2425cb76ad) - Bug 1259182 - Shrink keyCodeData. r=bz. (737204af84) - Bug 1193567 - Check result of ReadID in nsXBLPrototypeBinding::Read(). r=wchen (c9b1c35bf3) - Bug 1173344 - Remove an intermediary root from nsXBLProtoImplField's FieldGetterImpl; r=jandem (5f42dd2e48) - Bug 1207494 - Part 14: Remove use of expression closure from dom/xbl/. r=bz (21c7d3825f) - align tests (fe34b613d3) - Bug 1223702 - Fix some errors about wifi direct. r=hchang (568d86054a) - Bug 1166274 - Part 1: Handle the callback and IPC message of setStaticIpMode correctly. r=vchang (8fb8d7f3b7) - Bug 1133665 - [Flame][Wifi] The SSID that has set to be binded with MAC address is not hightlighted when user taps it. r=hchang (3165471d13) - Bug 1207494 - Part 13: Remove use of expression closure from dom/wifi/. r=henry (dd9ad23a8a) - Bug 1251856 - Disable U2F in all releases (fix for 1231681). r=baku (24ada10566) - align tests (dae9ecd0ee) - var-let (11a3cb0878) - Bug 1184822 - Use classId to get provider. r=fabrice (1288eccd06) - Bug 1247410 - "test for _nomap ids does not work correctly". r=dougt (f736a04f08) - Bug 1035097 - Changed the type from 'radio' to 'radioType'. r=jdm (f9a0079152) - Bug 1177871 - Add a timeout to XHR request of WifiGeoPositionProvider. r=jdm (2f6aa87c20) - align code to 978593 with POST and location structure (d8ba75a759) - Bug 1230685 - Replace function declarations with add_task statements in test_storage_value_array.js and test_unicode.js. r=mak (9822bf2215) - Bug 1230683 - Replace try/catch with Assert.throws in test_storage_connection.js. r=mak (1c993fc37e) - Bug 655722 - Rewrite _buildGUIDMap in the sync bookmark engine to use PlacesUtils.promiseBookmarksTree. r=mak (3795d26af0) - Bug 1251057 - enable debug logging for rest.js requests and responses. r=adw (1062bcd113) - Bug 503515 - Try and ensure exported certificates include an extension by default. r=keeler (505967ab7f) - Bug 1017616 - Filter out some more unnecessary characters when exporting certs. r=keeler (e95838e362) - Bug 1241614 - don't overflow:auto the container, use em to size the dialog to avoid hidpi visibility issues, r=dolske,ttaubert (8bd6c2b35b) - Bug 1266851. Make <xmp> and <listing> use HTMLPreElement as their primary interface, per <whatwg/html#1015>. r=peterv (6be7f9d6e9) - Bug 1262184 - Block embed content loading when child of media element; r=bz (a297eeb378) - Bug 1263696 - Block embed content loading when ancestor of object element with content; r=bz (89c143cbfe) - Bug 1266077. Fix <base> href getter to follow the spec; it should be using the fallback base URI to resolve against, not the document URI. r=bkelly (e757b23a14) - Bug 1168079 nsTextEditRules::CollapseSelectionToTrailingBRIfNeeded() should ensure that there is a selection before calling nsEditor::GetStartNodeAndOffset() r=ehsan (6c283bf3a7) - Bug 898321 - Return success from nsTableEditor::GetCellAt if frame not found; r=ehsan (0d09143b95) - Bug 387687 - wrap quotes in plain text replies to window. r=masayuki (ca51437018) - Bug 1247483 - Only replace nodes in nsHTMLEditor::ReplaceOrphanedStructure if all nodes in node list are descendants of replacement node. r=ehsan (8416037da2) - bug 1266496 - fire some selection events for proxied accessibles r=davidb (8806de7dd9) - bug 1266518 - add a new event message for AccSelChangeEvents r=davidb (46af183cab) - Bug 953265: Adjust Opus bitrate in WebRTC to pass >8KHz audio, and comment r=bwc (b0be6a326e) - Bug 1221473: Do not treat answer as authoritative wrt payload types. r=drno (d27409209e) - Bug 1241321 - No RTCP stats for audio streams. r=rjesup (ec0222694e) - bug 1250492 - use tl::Max instead of std::max to get rid of a static constructor r=jesup (3cebbc8969) - Bug 1254187: Fix maxBitrate to respect simulcast. r=jesup (e569e54b57) - Bug 1158931 - Fix static assertion compilation error; r=snorp (eb27881746) - No bug, fix WebrtcMediaCodecVP8VideoCodec.cpp warnings (a983544581) - Bug 1252737 - use size_t instead of uint32_t for InitEncode(). r=jesup (57c3abc9fa) - Bug 1208371 - Never send more than one disabled frame in a row to the WebRTC encoder. r=jesup (ec0c28822b) - Bug 1208371 - Do image format conversion async in MediaPipeline. r=jesup (032efec783) - Bug 1266685 - Don't pass too many frames to the MediaPipelineTransmit VideoFrameConverter. r=jesup (21774a8d25) - Bug 1266644 - Rename StreamBuffer to StreamTracks. r=jesup r=pehrsons (21906fe1f7) - Bug 1208371 - Don't treat audio chunks as mutable in MediaPipeline. r=padenot (3878ef4332) - Bug 1246310 - Let MediaPipelineReceive tracks start at 0. r=jesup (b468ff8d48) - Bug 1266644 - Rename DOMMediaStream:: CreateXXXStream to DOMMediaStream:: CreateXXXStreamAsInput. r=jesup r=pehrsons (fe4b6d70bc) - Bug 1234578: Add an assertion. r=drno, a=abillings (f1a2c8d841) - bug 1250492 - include sstream in SdpMediaSection.h instead of iostream r=jesup (110b5c2eca) - Bug 1264470 - a=identity is a long attribute, r=bwc (5848194fe9) - Bug 1256750: Remove unnecessary sscanf_s parameter on windows, and fix format string everywhere else. r=jesup (371c0db476) - Bug 1204082 - try strtoull instead. r=mt (a0313aa87c) - Bug 1113443 - reject each media type with approriate default. r=bwc (a72ff312d1) - Bug 1095793 - use mid if provided to place candidate in msection. r=bwc (2c29b21fac) - Bug 1252699 - Set WEBRTC_DETECT_ARM_NEON when optional neon is requested. r=jesup (722e2043a5) - Bug 1229475 - webrtc: Call opus tonality_analysis_init. r=jesup (1cf8cc2cd7) - Bug 1254876: assert windows recording is shut down r=pkerr (1f2cb69073) - Bug 1227481 - added a memset on aec. r=jesup (532026ce20) - Bug 1254507 - Fix leak in WebRTC DesktopApplication class. r=jesup (54da72aeb4) - Bug 1196542 - share only windows with non-zero area. r=pkerr (94595ec463) - Bug 1202087 - Filter out non-shareable application for win8 or greater. r=jesup (d989956802) - Bug 1216529 - WebRTC: Request camera permission before accessing camera APIs. r=gcp (24b6699226) - Bug 1237630 - Part 1: Video freeze from WebRTC sender. r=rjesup (02daa8b5b7) - Bug 1237630 - Part 2: remove LOG statement generating a now defunct error condition. r=rjesup (c6002ef12f) - Bug 1248335: avoid using SvcInternal structure entirely, as system-vpx may not have it r=pkerr (ef9b21f20c) - Bug 1234571: unregister encoded-frame callback when releasing codec databases r=pkerr (321bd5166b) - Bug 820972 - Comment out colorTable[] because we don't need it. r=jesup. (60b10803d5) - cleanup and missing test stuff (e2be0331d9) - Merge remote-tracking branch 'upstream/dev' into winbuild (3a3bb0b315) - layout/media: fix export symbol list, fix build bustage (f9f5bfe14c)
711 lines
16 KiB
C++
711 lines
16 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
#if !defined(MediaInfo_h)
|
|
#define MediaInfo_h
|
|
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "nsRect.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsSize.h"
|
|
#include "nsString.h"
|
|
#include "nsTArray.h"
|
|
#include "ImageTypes.h"
|
|
#include "MediaData.h"
|
|
#include "StreamTracks.h" // for TrackID
|
|
#include "TimeUnits.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class AudioInfo;
|
|
class VideoInfo;
|
|
class TextInfo;
|
|
|
|
class MetadataTag {
|
|
public:
|
|
MetadataTag(const nsACString& aKey,
|
|
const nsACString& aValue)
|
|
: mKey(aKey)
|
|
, mValue(aValue)
|
|
{}
|
|
nsCString mKey;
|
|
nsCString mValue;
|
|
};
|
|
|
|
class TrackInfo {
|
|
public:
|
|
enum TrackType {
|
|
kUndefinedTrack,
|
|
kAudioTrack,
|
|
kVideoTrack,
|
|
kTextTrack
|
|
};
|
|
TrackInfo(TrackType aType,
|
|
const nsAString& aId,
|
|
const nsAString& aKind,
|
|
const nsAString& aLabel,
|
|
const nsAString& aLanguage,
|
|
bool aEnabled,
|
|
TrackID aTrackId)
|
|
: mId(aId)
|
|
, mKind(aKind)
|
|
, mLabel(aLabel)
|
|
, mLanguage(aLanguage)
|
|
, mEnabled(aEnabled)
|
|
, mTrackId(aTrackId)
|
|
, mDuration(0)
|
|
, mMediaTime(0)
|
|
, mIsRenderedExternally(false)
|
|
, mType(aType)
|
|
{
|
|
MOZ_COUNT_CTOR(TrackInfo);
|
|
}
|
|
|
|
// Only used for backward compatibility. Do not use in new code.
|
|
void Init(const nsAString& aId,
|
|
const nsAString& aKind,
|
|
const nsAString& aLabel,
|
|
const nsAString& aLanguage,
|
|
bool aEnabled)
|
|
{
|
|
mId = aId;
|
|
mKind = aKind;
|
|
mLabel = aLabel;
|
|
mLanguage = aLanguage;
|
|
mEnabled = aEnabled;
|
|
}
|
|
|
|
// Fields common with MediaTrack object.
|
|
nsString mId;
|
|
nsString mKind;
|
|
nsString mLabel;
|
|
nsString mLanguage;
|
|
bool mEnabled;
|
|
|
|
TrackID mTrackId;
|
|
|
|
nsCString mMimeType;
|
|
int64_t mDuration;
|
|
int64_t mMediaTime;
|
|
CryptoTrack mCrypto;
|
|
|
|
nsTArray<MetadataTag> mTags;
|
|
|
|
// True if the track is gonna be (decrypted)/decoded and
|
|
// rendered directly by non-gecko components.
|
|
bool mIsRenderedExternally;
|
|
|
|
virtual AudioInfo* GetAsAudioInfo()
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual VideoInfo* GetAsVideoInfo()
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual TextInfo* GetAsTextInfo()
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual const AudioInfo* GetAsAudioInfo() const
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual const VideoInfo* GetAsVideoInfo() const
|
|
{
|
|
return nullptr;
|
|
}
|
|
virtual const TextInfo* GetAsTextInfo() const
|
|
{
|
|
return nullptr;
|
|
}
|
|
|
|
bool IsAudio() const
|
|
{
|
|
return !!GetAsAudioInfo();
|
|
}
|
|
bool IsVideo() const
|
|
{
|
|
return !!GetAsVideoInfo();
|
|
}
|
|
bool IsText() const
|
|
{
|
|
return !!GetAsTextInfo();
|
|
}
|
|
TrackType GetType() const
|
|
{
|
|
return mType;
|
|
}
|
|
|
|
bool virtual IsValid() const = 0;
|
|
|
|
virtual UniquePtr<TrackInfo> Clone() const = 0;
|
|
|
|
virtual ~TrackInfo()
|
|
{
|
|
MOZ_COUNT_DTOR(TrackInfo);
|
|
}
|
|
|
|
protected:
|
|
TrackInfo(const TrackInfo& aOther)
|
|
{
|
|
mId = aOther.mId;
|
|
mKind = aOther.mKind;
|
|
mLabel = aOther.mLabel;
|
|
mLanguage = aOther.mLanguage;
|
|
mEnabled = aOther.mEnabled;
|
|
mTrackId = aOther.mTrackId;
|
|
mMimeType = aOther.mMimeType;
|
|
mDuration = aOther.mDuration;
|
|
mMediaTime = aOther.mMediaTime;
|
|
mCrypto = aOther.mCrypto;
|
|
mIsRenderedExternally = aOther.mIsRenderedExternally;
|
|
mType = aOther.mType;
|
|
mTags = aOther.mTags;
|
|
MOZ_COUNT_CTOR(TrackInfo);
|
|
}
|
|
|
|
private:
|
|
TrackType mType;
|
|
};
|
|
|
|
// Stores info relevant to presenting media frames.
|
|
class VideoInfo : public TrackInfo {
|
|
public:
|
|
enum Rotation {
|
|
kDegree_0 = 0,
|
|
kDegree_90 = 90,
|
|
kDegree_180 = 180,
|
|
kDegree_270 = 270,
|
|
};
|
|
VideoInfo()
|
|
: VideoInfo(-1, -1)
|
|
{
|
|
}
|
|
|
|
VideoInfo(int32_t aWidth, int32_t aHeight)
|
|
: TrackInfo(kVideoTrack, NS_LITERAL_STRING("2"), NS_LITERAL_STRING("main"),
|
|
EmptyString(), EmptyString(), true, 2)
|
|
, mDisplay(nsIntSize(aWidth, aHeight))
|
|
, mStereoMode(StereoMode::MONO)
|
|
, mImage(nsIntSize(aWidth, aHeight))
|
|
, mCodecSpecificConfig(new MediaByteBuffer)
|
|
, mExtraData(new MediaByteBuffer)
|
|
, mRotation(kDegree_0)
|
|
, mImageRect(nsIntRect(0, 0, aWidth, aHeight))
|
|
{
|
|
}
|
|
|
|
VideoInfo(const VideoInfo& aOther)
|
|
: TrackInfo(aOther)
|
|
, mDisplay(aOther.mDisplay)
|
|
, mStereoMode(aOther.mStereoMode)
|
|
, mImage(aOther.mImage)
|
|
, mCodecSpecificConfig(aOther.mCodecSpecificConfig)
|
|
, mExtraData(aOther.mExtraData)
|
|
, mRotation(aOther.mRotation)
|
|
, mImageRect(aOther.mImageRect)
|
|
{
|
|
}
|
|
|
|
bool IsValid() const override
|
|
{
|
|
return mDisplay.width > 0 && mDisplay.height > 0;
|
|
}
|
|
|
|
VideoInfo* GetAsVideoInfo() override
|
|
{
|
|
return this;
|
|
}
|
|
|
|
const VideoInfo* GetAsVideoInfo() const override
|
|
{
|
|
return this;
|
|
}
|
|
|
|
UniquePtr<TrackInfo> Clone() const override
|
|
{
|
|
return MakeUnique<VideoInfo>(*this);
|
|
}
|
|
|
|
nsIntRect ImageRect() const
|
|
{
|
|
if (mImageRect.width < 0 || mImageRect.height < 0) {
|
|
return nsIntRect(0, 0, mImage.width, mImage.height);
|
|
}
|
|
return mImageRect;
|
|
}
|
|
|
|
void SetImageRect(const nsIntRect& aRect)
|
|
{
|
|
mImageRect = aRect;
|
|
}
|
|
|
|
// Returned the crop rectangle scaled to aWidth/aHeight size relative to
|
|
// mImage size.
|
|
// If aWidth and aHeight are identical to the original mImage.width/mImage.height
|
|
// then the scaling ratio will be 1.
|
|
// This is used for when the frame size is different from what the container
|
|
// reports. This is legal in WebM, and we will preserve the ratio of the crop
|
|
// rectangle as it was reported relative to the picture size reported by the
|
|
// container.
|
|
nsIntRect ScaledImageRect(int64_t aWidth, int64_t aHeight) const
|
|
{
|
|
if (aWidth == mImage.width && aHeight == mImage.height) {
|
|
return ImageRect();
|
|
}
|
|
nsIntRect imageRect = ImageRect();
|
|
imageRect.x = (imageRect.x * aWidth) / mImage.width;
|
|
imageRect.y = (imageRect.y * aHeight) / mImage.height;
|
|
imageRect.width = (aWidth * imageRect.width) / mImage.width;
|
|
imageRect.height = (aHeight * imageRect.height) / mImage.height;
|
|
return imageRect;
|
|
}
|
|
|
|
Rotation ToSupportedRotation(int32_t aDegree)
|
|
{
|
|
switch (aDegree) {
|
|
case 90:
|
|
return kDegree_90;
|
|
case 180:
|
|
return kDegree_180;
|
|
case 270:
|
|
return kDegree_270;
|
|
default:
|
|
NS_WARN_IF_FALSE(aDegree == 0, "Invalid rotation degree, ignored");
|
|
return kDegree_0;
|
|
}
|
|
}
|
|
|
|
// Size in pixels at which the video is rendered. This is after it has
|
|
// been scaled by its aspect ratio.
|
|
nsIntSize mDisplay;
|
|
|
|
// Indicates the frame layout for single track stereo videos.
|
|
StereoMode mStereoMode;
|
|
|
|
// Size of the decoded video's image.
|
|
nsIntSize mImage;
|
|
|
|
RefPtr<MediaByteBuffer> mCodecSpecificConfig;
|
|
RefPtr<MediaByteBuffer> mExtraData;
|
|
|
|
// Describing how many degrees video frames should be rotated in clock-wise to
|
|
// get correct view.
|
|
Rotation mRotation;
|
|
|
|
private:
|
|
// mImage may be cropped; currently only used with the WebM container.
|
|
// A negative width or height indicate that no cropping is to occur.
|
|
nsIntRect mImageRect;
|
|
};
|
|
|
|
class AudioInfo : public TrackInfo {
|
|
public:
|
|
AudioInfo()
|
|
: TrackInfo(kAudioTrack, NS_LITERAL_STRING("1"), NS_LITERAL_STRING("main"),
|
|
EmptyString(), EmptyString(), true, 1)
|
|
, mRate(0)
|
|
, mChannels(0)
|
|
, mBitDepth(0)
|
|
, mProfile(0)
|
|
, mExtendedProfile(0)
|
|
, mCodecSpecificConfig(new MediaByteBuffer)
|
|
, mExtraData(new MediaByteBuffer)
|
|
{
|
|
}
|
|
|
|
AudioInfo(const AudioInfo& aOther)
|
|
: TrackInfo(aOther)
|
|
, mRate(aOther.mRate)
|
|
, mChannels(aOther.mChannels)
|
|
, mBitDepth(aOther.mBitDepth)
|
|
, mProfile(aOther.mProfile)
|
|
, mExtendedProfile(aOther.mExtendedProfile)
|
|
, mCodecSpecificConfig(aOther.mCodecSpecificConfig)
|
|
, mExtraData(aOther.mExtraData)
|
|
{
|
|
}
|
|
|
|
bool IsValid() const override
|
|
{
|
|
return mChannels > 0 && mRate > 0;
|
|
}
|
|
|
|
AudioInfo* GetAsAudioInfo() override
|
|
{
|
|
return this;
|
|
}
|
|
|
|
const AudioInfo* GetAsAudioInfo() const override
|
|
{
|
|
return this;
|
|
}
|
|
|
|
UniquePtr<TrackInfo> Clone() const override
|
|
{
|
|
return MakeUnique<AudioInfo>(*this);
|
|
}
|
|
|
|
// Sample rate.
|
|
uint32_t mRate;
|
|
|
|
// Number of audio channels.
|
|
uint32_t mChannels;
|
|
|
|
// Bits per sample.
|
|
uint32_t mBitDepth;
|
|
|
|
// Codec profile.
|
|
int8_t mProfile;
|
|
|
|
// Extended codec profile.
|
|
int8_t mExtendedProfile;
|
|
|
|
RefPtr<MediaByteBuffer> mCodecSpecificConfig;
|
|
RefPtr<MediaByteBuffer> mExtraData;
|
|
|
|
};
|
|
|
|
class EncryptionInfo {
|
|
public:
|
|
EncryptionInfo()
|
|
: mEncrypted(false)
|
|
{
|
|
}
|
|
|
|
struct InitData {
|
|
template<typename AInitDatas>
|
|
InitData(const nsAString& aType, AInitDatas&& aInitData)
|
|
: mType(aType)
|
|
, mInitData(Forward<AInitDatas>(aInitData))
|
|
{
|
|
}
|
|
|
|
// Encryption type to be passed to JS. Usually `cenc'.
|
|
nsString mType;
|
|
|
|
// Encryption data.
|
|
nsTArray<uint8_t> mInitData;
|
|
};
|
|
typedef nsTArray<InitData> InitDatas;
|
|
|
|
// True if the stream has encryption metadata
|
|
bool IsEncrypted() const
|
|
{
|
|
return mEncrypted;
|
|
}
|
|
|
|
template<typename AInitDatas>
|
|
void AddInitData(const nsAString& aType, AInitDatas&& aInitData)
|
|
{
|
|
mInitDatas.AppendElement(InitData(aType, Forward<AInitDatas>(aInitData)));
|
|
mEncrypted = true;
|
|
}
|
|
|
|
void AddInitData(const EncryptionInfo& aInfo)
|
|
{
|
|
mInitDatas.AppendElements(aInfo.mInitDatas);
|
|
mEncrypted = !!mInitDatas.Length();
|
|
}
|
|
|
|
// One 'InitData' per encrypted buffer.
|
|
InitDatas mInitDatas;
|
|
private:
|
|
bool mEncrypted;
|
|
};
|
|
|
|
class MediaInfo {
|
|
public:
|
|
bool HasVideo() const
|
|
{
|
|
return mVideo.IsValid();
|
|
}
|
|
|
|
void EnableVideo()
|
|
{
|
|
if (HasVideo()) {
|
|
return;
|
|
}
|
|
// Set dummy values so that HasVideo() will return true;
|
|
// See VideoInfo::IsValid()
|
|
mVideo.mDisplay = nsIntSize(1, 1);
|
|
}
|
|
|
|
bool HasAudio() const
|
|
{
|
|
return mAudio.IsValid();
|
|
}
|
|
|
|
void EnableAudio()
|
|
{
|
|
if (HasAudio()) {
|
|
return;
|
|
}
|
|
// Set dummy values so that HasAudio() will return true;
|
|
// See AudioInfo::IsValid()
|
|
mAudio.mChannels = 2;
|
|
mAudio.mRate = 44100;
|
|
}
|
|
|
|
bool IsEncrypted() const
|
|
{
|
|
return mCrypto.IsEncrypted();
|
|
}
|
|
|
|
bool HasValidMedia() const
|
|
{
|
|
return HasVideo() || HasAudio();
|
|
}
|
|
|
|
void AssertValid() const
|
|
{
|
|
NS_ASSERTION(!HasAudio() || mAudio.mTrackId != TRACK_INVALID,
|
|
"Audio track ID must be valid");
|
|
NS_ASSERTION(!HasVideo() || mVideo.mTrackId != TRACK_INVALID,
|
|
"Audio track ID must be valid");
|
|
NS_ASSERTION(!HasAudio() || !HasVideo() ||
|
|
mAudio.mTrackId != mVideo.mTrackId,
|
|
"Duplicate track IDs");
|
|
}
|
|
|
|
// TODO: Store VideoInfo and AudioIndo in arrays to support multi-tracks.
|
|
VideoInfo mVideo;
|
|
AudioInfo mAudio;
|
|
|
|
// If the metadata includes a duration, we store it here.
|
|
media::NullableTimeUnit mMetadataDuration;
|
|
|
|
// The Ogg reader tries to kinda-sorta compute the duration by seeking to the
|
|
// end and determining the timestamp of the last frame. This isn't useful as
|
|
// a duration until we know the start time, so we need to track it separately.
|
|
media::NullableTimeUnit mUnadjustedMetadataEndTime;
|
|
|
|
// True if the media is seekable (i.e. supports random access).
|
|
bool mMediaSeekable = true;
|
|
|
|
// True if the media is only seekable within its buffered ranges.
|
|
bool mMediaSeekableOnlyInBufferedRanges = false;
|
|
|
|
EncryptionInfo mCrypto;
|
|
};
|
|
|
|
class SharedTrackInfo {
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SharedTrackInfo)
|
|
public:
|
|
SharedTrackInfo(const TrackInfo& aOriginal, uint32_t aStreamID)
|
|
: mInfo(aOriginal.Clone())
|
|
, mStreamSourceID(aStreamID)
|
|
, mMimeType(mInfo->mMimeType)
|
|
{
|
|
}
|
|
|
|
uint32_t GetID() const
|
|
{
|
|
return mStreamSourceID;
|
|
}
|
|
|
|
const TrackInfo* operator*() const
|
|
{
|
|
return mInfo.get();
|
|
}
|
|
|
|
const TrackInfo* operator->() const
|
|
{
|
|
MOZ_ASSERT(mInfo.get(), "dereferencing a UniquePtr containing nullptr");
|
|
return mInfo.get();
|
|
}
|
|
|
|
const AudioInfo* GetAsAudioInfo() const
|
|
{
|
|
return mInfo ? mInfo->GetAsAudioInfo() : nullptr;
|
|
}
|
|
|
|
const VideoInfo* GetAsVideoInfo() const
|
|
{
|
|
return mInfo ? mInfo->GetAsVideoInfo() : nullptr;
|
|
}
|
|
|
|
const TextInfo* GetAsTextInfo() const
|
|
{
|
|
return mInfo ? mInfo->GetAsTextInfo() : nullptr;
|
|
}
|
|
|
|
private:
|
|
~SharedTrackInfo() {};
|
|
UniquePtr<TrackInfo> mInfo;
|
|
// A unique ID, guaranteed to change when changing streams.
|
|
uint32_t mStreamSourceID;
|
|
|
|
public:
|
|
const nsCString& mMimeType;
|
|
};
|
|
|
|
// Maximum channel number we can currently handle (7.1)
|
|
#define MAX_AUDIO_CHANNELS 8
|
|
|
|
class AudioConfig {
|
|
public:
|
|
enum Channel {
|
|
CHANNEL_INVALID = -1,
|
|
CHANNEL_MONO = 0,
|
|
CHANNEL_LEFT,
|
|
CHANNEL_RIGHT,
|
|
CHANNEL_CENTER,
|
|
CHANNEL_LS,
|
|
CHANNEL_RS,
|
|
CHANNEL_RLS,
|
|
CHANNEL_RCENTER,
|
|
CHANNEL_RRS,
|
|
CHANNEL_LFE,
|
|
};
|
|
|
|
class ChannelLayout {
|
|
public:
|
|
ChannelLayout()
|
|
: mChannelMap(0)
|
|
, mValid(false)
|
|
{}
|
|
explicit ChannelLayout(uint32_t aChannels)
|
|
: ChannelLayout(aChannels, SMPTEDefault(aChannels))
|
|
{}
|
|
ChannelLayout(uint32_t aChannels, const Channel* aConfig)
|
|
: ChannelLayout()
|
|
{
|
|
if (!aConfig) {
|
|
mValid = false;
|
|
return;
|
|
}
|
|
mChannels.AppendElements(aConfig, aChannels);
|
|
UpdateChannelMap();
|
|
}
|
|
bool operator==(const ChannelLayout& aOther) const
|
|
{
|
|
return mChannels == aOther.mChannels;
|
|
}
|
|
bool operator!=(const ChannelLayout& aOther) const
|
|
{
|
|
return mChannels != aOther.mChannels;
|
|
}
|
|
const Channel& operator[](uint32_t aIndex) const
|
|
{
|
|
return mChannels[aIndex];
|
|
}
|
|
uint32_t Count() const
|
|
{
|
|
return mChannels.Length();
|
|
}
|
|
uint32_t Map() const
|
|
{
|
|
return mChannelMap;
|
|
}
|
|
// Calculate the mapping table from the current layout to aOther such that
|
|
// one can easily go from one layout to the other by doing:
|
|
// out[channel] = in[map[channel]].
|
|
// Returns true if the reordering is possible or false otherwise.
|
|
// If true, then aMap, if set, will be updated to contain the mapping table
|
|
// allowing conversion from the current layout to aOther.
|
|
// If aMap is nullptr, then MappingTable can be used to simply determine if
|
|
// the current layout can be easily reordered to aOther.
|
|
// aMap must be an array of size MAX_AUDIO_CHANNELS.
|
|
bool MappingTable(const ChannelLayout& aOther, uint8_t* aMap = nullptr) const;
|
|
bool IsValid() const {
|
|
return mValid;
|
|
}
|
|
bool HasChannel(Channel aChannel) const
|
|
{
|
|
return mChannelMap & (1 << aChannel);
|
|
}
|
|
private:
|
|
void UpdateChannelMap();
|
|
const Channel* SMPTEDefault(uint32_t aChannels) const;
|
|
AutoTArray<Channel, MAX_AUDIO_CHANNELS> mChannels;
|
|
uint32_t mChannelMap;
|
|
bool mValid;
|
|
};
|
|
|
|
enum SampleFormat {
|
|
FORMAT_NONE = 0,
|
|
FORMAT_U8,
|
|
FORMAT_S16,
|
|
FORMAT_S24LSB,
|
|
FORMAT_S24,
|
|
FORMAT_S32,
|
|
FORMAT_FLT,
|
|
#if defined(MOZ_SAMPLE_TYPE_FLOAT32)
|
|
FORMAT_DEFAULT = FORMAT_FLT
|
|
#elif defined(MOZ_SAMPLE_TYPE_S16)
|
|
FORMAT_DEFAULT = FORMAT_S16
|
|
#else
|
|
#error "Not supported audio type"
|
|
#endif
|
|
};
|
|
|
|
AudioConfig(const ChannelLayout& aChannelLayout, uint32_t aRate,
|
|
AudioConfig::SampleFormat aFormat = FORMAT_DEFAULT,
|
|
bool aInterleaved = true);
|
|
// Will create a channel configuration from default SMPTE ordering.
|
|
AudioConfig(uint32_t aChannels, uint32_t aRate,
|
|
AudioConfig::SampleFormat aFormat = FORMAT_DEFAULT,
|
|
bool aInterleaved = true);
|
|
|
|
const ChannelLayout& Layout() const
|
|
{
|
|
return mChannelLayout;
|
|
}
|
|
uint32_t Channels() const
|
|
{
|
|
if (!mChannelLayout.IsValid()) {
|
|
return mChannels;
|
|
}
|
|
return mChannelLayout.Count();
|
|
}
|
|
uint32_t Rate() const
|
|
{
|
|
return mRate;
|
|
}
|
|
SampleFormat Format() const
|
|
{
|
|
return mFormat;
|
|
}
|
|
bool Interleaved() const
|
|
{
|
|
return mInterleaved;
|
|
}
|
|
bool operator==(const AudioConfig& aOther) const
|
|
{
|
|
return mChannelLayout == aOther.mChannelLayout &&
|
|
mRate == aOther.mRate && mFormat == aOther.mFormat &&
|
|
mInterleaved == aOther.mInterleaved;
|
|
}
|
|
bool operator!=(const AudioConfig& aOther) const
|
|
{
|
|
return !(*this == aOther);
|
|
}
|
|
|
|
static const char* FormatToString(SampleFormat aFormat);
|
|
static uint32_t SampleSize(SampleFormat aFormat);
|
|
static uint32_t FormatToBits(SampleFormat aFormat);
|
|
|
|
private:
|
|
// Channels configuration.
|
|
ChannelLayout mChannelLayout;
|
|
|
|
// Channel count.
|
|
uint32_t mChannels;
|
|
|
|
// Sample rate.
|
|
uint32_t mRate;
|
|
|
|
// Sample format.
|
|
SampleFormat mFormat;
|
|
|
|
bool mInterleaved;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // MediaInfo_h
|