mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
605fde2bb1
- Bug 1236120: [ffmpeg] Use demuxed dimensions to determine picture size and offset. r=gerald (f336c84d0d) - Bug 851530: Part 1 - Added support for decoding uLaw and aLaw enconded wave files. r=jya (72683b69f2) - Bug 851530: Part 2 - Added test cases for uLaw and aLaw wave files. r=jya (ddf431bd28) - Bug 524109 - Added support for 24 bit wav files. r=cpearce (ebfac16a20) - Bug 864780 - Changed handling of the format chunk to skip any extension. r=cpearce (40903839a8) - Bug 1229742: P1. Only clear EOS flag if we have new data. r=gerald (83e69375e4) - Bug 1229742: P2. Don't reject data promise if new data is pending. r=gerald (89d8222809) - Bug 1237809: P2. Detect change of display size. r=cpearce (ec529e2732) - Bug 1237809: [h264] P1. Ensure correct video dimensions are passed to the decoder. r=cpearce (eb241cad10) - Bug 1237809: P3. Ensure element dimensions are up to date. r=jwwang (541e6e74d7) - Bug 1244639: P1. Don't assume MP3 decoding always starts at 0. r=cpearce (b62c27bd04) - Bug 1244639: P2. Don't clamp audio time to seek time if there's no video track. r=cpearce (4720bacc24) - Bug 1205927 - Part 1: [MediaEncoder] Support *.3g2 with EVRC audio format. r=ayang (bbd8aff9d9) - Bug 1205927 - Part 2: Add audio-capture:3gpp2 perimission for certificated and privileged application. r=ayang (63b337e2ab) - Bug 1198157 - Call |NotifyEndOfStream| if the encoder can't been initialized after 30 seconds. r=jwwang (2c21203d36) - minor NL (14d757753b) - Bug 1182426 - Add some asserts to VP8TrackEncoder for sanity. r=roc (79ff4869ca) - Bug 1154213 - Handle timestamps of video/webm vorbis track encoding. r=mreavy, r=rjesup (a9897e4873) - Bug 1137151: Marked destructor of |MuxerOperation| as protected, r=sotaro (94fdcf6457) - Bug 1210232 - Let MP4Decoder handle 3GPP files on B2G. r=cpearce (95a77023ad) - Bug 1227790 - Update GMP API to include new MediaKeyStatus types. r=jwwang (1a6933f2df) - bits of Bug 1186375 - Add GMP EME (6b99660146) - Bug 1221825: Fix logging arguments. r=cpearce (5261e34713) - Bug 1244442 - Warn about Proxy.create and Proxy.createFunction. r=Waldo (718aa94f5b) - fix spaces (720e2114f7) - re-apply Bug 1231224 part 7 - Fix some more places to handle OOM. r=jonco (a4af46894b) - Bug 1246122 - Don't crash in InvokeInterruptCallback if there are no JS scripts on the stack. r=shu (9702df89bc) - Bug 1246607: Recover from OOM in AddClearDefiniteGetterSetterForPrototypeChain; r=jandem (d83c6c6c9b) - Bug 1236546 - Don't deoptimize in ObjectGroup::defaultNewGroup when we have a null proto. r=bhackett (1c2ecc3d09) - Bug 1249588 - Remove unnecessary type information from RegExpObject. r=jandem (9126e17d94) - Bug 1245965 - Fix an OOM in ObjectGroup::newPlainObject; r=till (5192c25b53) - Bug 1240527: Fix tracing of RegExpStaticsObject; r=nbp (b37f2167a5) - Bug 1248094 - Followup to fix a typo; r=fitzgen (8afec429d9) - Bug 1248726 - Simplify PCLocationMap even further; r=fitzgen (39f0b54a04) - Bug 1241311 - Pre-tenure SavedFrame objects. r=terrence (b703f3d78e) - Bug 1241249 - Add an SPS pseudo entry for JS stack capturing; r=shu (c2ae4ee5c2) - Bug 1247299 - Force SavedFrame columns to be 0 in JS_MORE_DETERMINISTIC builds; r=sfink (09b9038448) - Bug 1241701 - Add about:memory reporting for js::SavedStacks::pcLocationMap. r=njn (b663d911fc) - Bug 1166234 - Throw on accessing optimized out values when using Debugger.Frame.prototype.eval. (r=jimb) (19b43b137b) - Bug 1232655 - Fix DebugScopeProxy::has to not lookup .this on non-function scopes. r=shu (3959e98752) - Bug 1216261 - Fix OOM handling of DebugScopes. (r=jonco) (0f8b856ee6) - reorder after mispatch (c292050275) - Bug 1235656 - Followup: Allow extended functions with guessed atoms in self-hosted code. (rs=arai) (a67286cd52) - Bug 1245048: Check call to GetPrototype; r=till (35dbbdc025) - Bug 1132630 - Renumber steps in Function.prototype.bind. r=till (9f11a5a086) - Bug 1246131 - Provide 'dbg(msg)' debug printing utility function for self-hosted code. r=jandem (f436eeb481) - Bug 1246131 - Part 2: Let opt builds compile again, even on a CLOSED TREE. r=bustage (8483b77541) - Bug 1247934 - Handle receiving unboxed exports array from self hosted module code r=shu (fb9c296909) - Bug 1246134 - Fix loading of external self-hosted JS using MOZ_SELFHOSTEDJS. r=efaust (c96059b40a) - Bug 1220502 - ignore not visible text nodes for tree update, r=tbsaunde, roc (eed078abc6) - Bug 1242989 - keep content insertions in a hash, r=tbsaunde (d58fc948a6) - bug 1228400 - null check tabChild before notifying the parent process about new child documents r=davidb (09512e6287) - Bug 1239051 - Labels should expose labeled controllers action. r=tbsaunde (c0d4d801a9) - bug 1243077 - make xpcAccessible::GetFirstChild() work with proxies r=davidb (f539fafe93) - bug 1243077 - make xpcAccessible::GetLastChild() work with proxied accessibles r=davidb (13716f7cc0) - bug 1243077 - implement xpcAccessible::GetChildCount() for proxied accessibles (b8f4598834) - bug 1243077 - make xpcAccessible::GetChildAt() work with proxied accessibles r=davidb (cce0924f7b) - bug 1243077 - make xpcAccessible::GetChildren() work with proxied accessibles r=davidb (a9ec2b1588) - bug 1243077 - remove an unnecessary AddRef() from xpcAccessible::GetChildren() (89a58ac2e0) - bug 1243077 - support proxied accessibles in xpcAccessible::GetRole() r=davidb (2d2a2926c7) - Bug 1246768 - part 1: argument conversion for Atomics.isLockFree in runtime. r=bbouvier (17f3498b84) - Bug 1246750 - fix argument ordering to futexWakeOrRequeue + test cases. r=bbouvier (31825e7096) - Bug 1238911 - initialize canWait with false from constructor, avoid using the variable without initialization. r=lhansen (f4657b3950) - Bug 1235373 - Add an assert to check validity of pointers: mElement->GetPrimaryFrame() and frame. r=surkov (18023f9238) - Bug 1241534 - Use TraceRoot for InterpreterFrame fields. r=terrence (98996dc497) - Bug 1246112 - Fix a bogus assert in InterpreterFrame::initExecuteFrame. r=su (2093ba8a44) - Bug 1243241 - Make RDTSC monotonic. r=jandem (1450a97a94) - Bug 1243242 - Don't make structured cloning O(n**2) in the size of the transferables array. r=sfink (aa38dee282)
212 lines
6.7 KiB
C++
212 lines
6.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
|
|
/* 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/. */
|
|
|
|
#include "EbmlComposer.h"
|
|
#include "mozilla/UniquePtr.h"
|
|
#include "libmkv/EbmlIDs.h"
|
|
#include "libmkv/EbmlWriter.h"
|
|
#include "libmkv/WebMElement.h"
|
|
#include "prtime.h"
|
|
|
|
namespace mozilla {
|
|
|
|
// Timecode scale in nanoseconds
|
|
static const unsigned long TIME_CODE_SCALE = 1000000;
|
|
// The WebM header size without audio CodecPrivateData
|
|
static const int32_t DEFAULT_HEADER_SIZE = 1024;
|
|
|
|
void EbmlComposer::GenerateHeader()
|
|
{
|
|
// Write the EBML header.
|
|
EbmlGlobal ebml;
|
|
// The WEbM header default size usually smaller than 1k.
|
|
auto buffer = MakeUnique<uint8_t[]>(DEFAULT_HEADER_SIZE +
|
|
mCodecPrivateData.Length());
|
|
ebml.buf = buffer.get();
|
|
ebml.offset = 0;
|
|
writeHeader(&ebml);
|
|
{
|
|
EbmlLoc segEbmlLoc, ebmlLocseg, ebmlLoc;
|
|
Ebml_StartSubElement(&ebml, &segEbmlLoc, Segment);
|
|
{
|
|
Ebml_StartSubElement(&ebml, &ebmlLocseg, SeekHead);
|
|
// Todo: We don't know the exact sizes of encoded data and
|
|
// ignore this section.
|
|
Ebml_EndSubElement(&ebml, &ebmlLocseg);
|
|
writeSegmentInformation(&ebml, &ebmlLoc, TIME_CODE_SCALE, 0);
|
|
{
|
|
EbmlLoc trackLoc;
|
|
Ebml_StartSubElement(&ebml, &trackLoc, Tracks);
|
|
{
|
|
// Video
|
|
if (mWidth > 0 && mHeight > 0) {
|
|
writeVideoTrack(&ebml, 0x1, 0, "V_VP8",
|
|
mWidth, mHeight,
|
|
mDisplayWidth, mDisplayHeight, mFrameRate);
|
|
}
|
|
// Audio
|
|
if (mCodecPrivateData.Length() > 0) {
|
|
writeAudioTrack(&ebml, 0x2, 0x0, "A_VORBIS", mSampleFreq,
|
|
mChannels, mCodecPrivateData.Elements(),
|
|
mCodecPrivateData.Length());
|
|
}
|
|
}
|
|
Ebml_EndSubElement(&ebml, &trackLoc);
|
|
}
|
|
}
|
|
// The Recording length is unknown and
|
|
// ignore write the whole Segment element size
|
|
}
|
|
MOZ_ASSERT(ebml.offset <= DEFAULT_HEADER_SIZE + mCodecPrivateData.Length(),
|
|
"write more data > EBML_BUFFER_SIZE");
|
|
auto block = mClusterBuffs.AppendElement();
|
|
block->SetLength(ebml.offset);
|
|
memcpy(block->Elements(), ebml.buf, ebml.offset);
|
|
mFlushState |= FLUSH_METADATA;
|
|
}
|
|
|
|
void EbmlComposer::FinishMetadata()
|
|
{
|
|
if (mFlushState & FLUSH_METADATA) {
|
|
// We don't remove the first element of mClusterBuffs because the
|
|
// |mClusterHeaderIndex| may have value.
|
|
mClusterCanFlushBuffs.AppendElement()->SwapElements(mClusterBuffs[0]);
|
|
mFlushState &= ~FLUSH_METADATA;
|
|
}
|
|
}
|
|
|
|
void EbmlComposer::FinishCluster()
|
|
{
|
|
FinishMetadata();
|
|
if (!(mFlushState & FLUSH_CLUSTER)) {
|
|
// No completed cluster available.
|
|
return;
|
|
}
|
|
|
|
MOZ_ASSERT(mClusterLengthLoc > 0);
|
|
EbmlGlobal ebml;
|
|
EbmlLoc ebmlLoc;
|
|
ebmlLoc.offset = mClusterLengthLoc;
|
|
ebml.offset = 0;
|
|
for (uint32_t i = mClusterHeaderIndex; i < mClusterBuffs.Length(); i++) {
|
|
ebml.offset += mClusterBuffs[i].Length();
|
|
}
|
|
ebml.buf = mClusterBuffs[mClusterHeaderIndex].Elements();
|
|
Ebml_EndSubElement(&ebml, &ebmlLoc);
|
|
// Move the mClusterBuffs data from mClusterHeaderIndex that we can skip
|
|
// the metadata and the rest P-frames after ContainerWriter::FLUSH_NEEDED.
|
|
for (uint32_t i = mClusterHeaderIndex; i < mClusterBuffs.Length(); i++) {
|
|
mClusterCanFlushBuffs.AppendElement()->SwapElements(mClusterBuffs[i]);
|
|
}
|
|
|
|
mClusterHeaderIndex = 0;
|
|
mClusterLengthLoc = 0;
|
|
mClusterBuffs.Clear();
|
|
mFlushState &= ~FLUSH_CLUSTER;
|
|
}
|
|
|
|
void
|
|
EbmlComposer::WriteSimpleBlock(EncodedFrame* aFrame)
|
|
{
|
|
EbmlGlobal ebml;
|
|
ebml.offset = 0;
|
|
|
|
auto frameType = aFrame->GetFrameType();
|
|
bool isVP8IFrame = (frameType == EncodedFrame::FrameType::VP8_I_FRAME);
|
|
if (isVP8IFrame) {
|
|
FinishCluster();
|
|
}
|
|
|
|
auto block = mClusterBuffs.AppendElement();
|
|
block->SetLength(aFrame->GetFrameData().Length() + DEFAULT_HEADER_SIZE);
|
|
ebml.buf = block->Elements();
|
|
|
|
if (isVP8IFrame) {
|
|
EbmlLoc ebmlLoc;
|
|
Ebml_StartSubElement(&ebml, &ebmlLoc, Cluster);
|
|
MOZ_ASSERT(mClusterBuffs.Length() > 0);
|
|
// current cluster header array index
|
|
mClusterHeaderIndex = mClusterBuffs.Length() - 1;
|
|
mClusterLengthLoc = ebmlLoc.offset;
|
|
mClusterTimecode = aFrame->GetTimeStamp() / PR_USEC_PER_MSEC;
|
|
Ebml_SerializeUnsigned(&ebml, Timecode, mClusterTimecode);
|
|
mFlushState |= FLUSH_CLUSTER;
|
|
}
|
|
|
|
bool isVorbis = (frameType == EncodedFrame::FrameType::VORBIS_AUDIO_FRAME);
|
|
short timeCode = aFrame->GetTimeStamp() / PR_USEC_PER_MSEC - mClusterTimecode;
|
|
writeSimpleBlock(&ebml, isVorbis ? 0x2 : 0x1, timeCode, isVP8IFrame,
|
|
0, 0, (unsigned char*)aFrame->GetFrameData().Elements(),
|
|
aFrame->GetFrameData().Length());
|
|
MOZ_ASSERT(ebml.offset <= DEFAULT_HEADER_SIZE +
|
|
aFrame->GetFrameData().Length(),
|
|
"write more data > EBML_BUFFER_SIZE");
|
|
block->SetLength(ebml.offset);
|
|
}
|
|
|
|
void
|
|
EbmlComposer::SetVideoConfig(uint32_t aWidth, uint32_t aHeight,
|
|
uint32_t aDisplayWidth, uint32_t aDisplayHeight,
|
|
float aFrameRate)
|
|
{
|
|
MOZ_ASSERT(aWidth > 0, "Width should > 0");
|
|
MOZ_ASSERT(aHeight > 0, "Height should > 0");
|
|
MOZ_ASSERT(aDisplayWidth > 0, "DisplayWidth should > 0");
|
|
MOZ_ASSERT(aDisplayHeight > 0, "DisplayHeight should > 0");
|
|
MOZ_ASSERT(aFrameRate > 0, "FrameRate should > 0");
|
|
mWidth = aWidth;
|
|
mHeight = aHeight;
|
|
mDisplayWidth = aDisplayWidth;
|
|
mDisplayHeight = aDisplayHeight;
|
|
mFrameRate = aFrameRate;
|
|
}
|
|
|
|
void
|
|
EbmlComposer::SetAudioConfig(uint32_t aSampleFreq, uint32_t aChannels,
|
|
uint32_t aBitDepth)
|
|
{
|
|
MOZ_ASSERT(aSampleFreq > 0, "SampleFreq should > 0");
|
|
MOZ_ASSERT(aBitDepth > 0, "BitDepth should > 0");
|
|
MOZ_ASSERT(aChannels > 0, "Channels should > 0");
|
|
mSampleFreq = aSampleFreq;
|
|
mBitDepth = aBitDepth;
|
|
mChannels = aChannels;
|
|
}
|
|
|
|
void
|
|
EbmlComposer::ExtractBuffer(nsTArray<nsTArray<uint8_t> >* aDestBufs,
|
|
uint32_t aFlag)
|
|
{
|
|
if ((aFlag & ContainerWriter::FLUSH_NEEDED) ||
|
|
(aFlag & ContainerWriter::GET_HEADER))
|
|
{
|
|
FinishMetadata();
|
|
}
|
|
if (aFlag & ContainerWriter::FLUSH_NEEDED)
|
|
{
|
|
FinishCluster();
|
|
}
|
|
// aDestBufs may have some element
|
|
for (uint32_t i = 0; i < mClusterCanFlushBuffs.Length(); i++) {
|
|
aDestBufs->AppendElement()->SwapElements(mClusterCanFlushBuffs[i]);
|
|
}
|
|
mClusterCanFlushBuffs.Clear();
|
|
}
|
|
|
|
EbmlComposer::EbmlComposer()
|
|
: mFlushState(FLUSH_NONE)
|
|
, mClusterHeaderIndex(0)
|
|
, mClusterLengthLoc(0)
|
|
, mClusterTimecode(0)
|
|
, mWidth(0)
|
|
, mHeight(0)
|
|
, mFrameRate(0)
|
|
, mSampleFreq(0)
|
|
, mBitDepth(0)
|
|
, mChannels(0)
|
|
{}
|
|
|
|
} // namespace mozilla
|