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)
241 lines
7.9 KiB
C++
241 lines
7.9 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 "VorbisTrackEncoder.h"
|
|
#include <ogg/ogg.h>
|
|
#include <vorbis/vorbisenc.h>
|
|
#include "WebMWriter.h"
|
|
#include "GeckoProfiler.h"
|
|
|
|
// One actually used: Encoding using a VBR quality mode. The usable range is -.1
|
|
// (lowest quality, smallest file) to 1. (highest quality, largest file).
|
|
// Example quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR
|
|
// ret = vorbis_encode_init_vbr(&vi,2,44100,.4);
|
|
static const float BASE_QUALITY = 0.4f;
|
|
|
|
namespace mozilla {
|
|
|
|
#undef LOG
|
|
LazyLogModule gVorbisTrackEncoderLog("VorbisTrackEncoder");
|
|
#define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, mozilla::LogLevel::Debug, \
|
|
(msg, ##__VA_ARGS__))
|
|
|
|
VorbisTrackEncoder::VorbisTrackEncoder()
|
|
: AudioTrackEncoder()
|
|
{
|
|
MOZ_COUNT_CTOR(VorbisTrackEncoder);
|
|
}
|
|
|
|
VorbisTrackEncoder::~VorbisTrackEncoder()
|
|
{
|
|
MOZ_COUNT_DTOR(VorbisTrackEncoder);
|
|
if (mInitialized) {
|
|
vorbis_block_clear(&mVorbisBlock);
|
|
vorbis_dsp_clear(&mVorbisDsp);
|
|
vorbis_info_clear(&mVorbisInfo);
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
VorbisTrackEncoder::Init(int aChannels, int aSamplingRate)
|
|
{
|
|
NS_ENSURE_TRUE(aChannels > 0, NS_ERROR_INVALID_ARG);
|
|
NS_ENSURE_TRUE(aChannels <= 8, NS_ERROR_INVALID_ARG);
|
|
NS_ENSURE_TRUE(aSamplingRate >= 8000, NS_ERROR_INVALID_ARG);
|
|
NS_ENSURE_TRUE(aSamplingRate <= 192000, NS_ERROR_INVALID_ARG);
|
|
|
|
// This monitor is used to wake up other methods that are waiting for encoder
|
|
// to be completely initialized.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mChannels = aChannels;
|
|
mSamplingRate = aSamplingRate;
|
|
|
|
int ret = 0;
|
|
vorbis_info_init(&mVorbisInfo);
|
|
double quality = mAudioBitrate ? (double)mAudioBitrate/aSamplingRate :
|
|
BASE_QUALITY;
|
|
|
|
printf("quality %f \n", quality);
|
|
ret = vorbis_encode_init_vbr(&mVorbisInfo, mChannels, mSamplingRate,
|
|
quality);
|
|
|
|
mInitialized = (ret == 0);
|
|
|
|
if (mInitialized) {
|
|
// Set up the analysis state and auxiliary encoding storage
|
|
vorbis_analysis_init(&mVorbisDsp, &mVorbisInfo);
|
|
vorbis_block_init(&mVorbisDsp, &mVorbisBlock);
|
|
}
|
|
|
|
mon.NotifyAll();
|
|
|
|
return ret == 0 ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
void VorbisTrackEncoder::WriteLacing(nsTArray<uint8_t> *aOutput, int32_t aLacing)
|
|
{
|
|
while (aLacing >= 255) {
|
|
aLacing -= 255;
|
|
aOutput->AppendElement(255);
|
|
}
|
|
aOutput->AppendElement((uint8_t)aLacing);
|
|
}
|
|
|
|
already_AddRefed<TrackMetadataBase>
|
|
VorbisTrackEncoder::GetMetadata()
|
|
{
|
|
PROFILER_LABEL("VorbisTrackEncoder", "GetMetadata",
|
|
js::ProfileEntry::Category::OTHER);
|
|
{
|
|
// Wait if encoder is not initialized.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
while (!mCanceled && !mInitialized) {
|
|
mon.Wait();
|
|
}
|
|
}
|
|
|
|
if (mCanceled || mEncodingComplete) {
|
|
return nullptr;
|
|
}
|
|
|
|
// Vorbis codec specific data
|
|
// http://matroska.org/technical/specs/codecid/index.html
|
|
RefPtr<VorbisMetadata> meta = new VorbisMetadata();
|
|
meta->mBitDepth = 32; // float for desktop
|
|
meta->mChannels = mChannels;
|
|
meta->mSamplingFrequency = mSamplingRate;
|
|
ogg_packet header;
|
|
ogg_packet header_comm;
|
|
ogg_packet header_code;
|
|
// Add comment
|
|
vorbis_comment vorbisComment;
|
|
vorbis_comment_init(&vorbisComment);
|
|
vorbis_comment_add_tag(&vorbisComment, "ENCODER",
|
|
NS_LITERAL_CSTRING("Mozilla VorbisTrackEncoder " MOZ_APP_UA_VERSION).get());
|
|
vorbis_analysis_headerout(&mVorbisDsp, &vorbisComment,
|
|
&header,&header_comm, &header_code);
|
|
vorbis_comment_clear(&vorbisComment);
|
|
// number of distinct packets - 1
|
|
meta->mData.AppendElement(2);
|
|
// Xiph-style lacing header.bytes, header_comm.bytes
|
|
WriteLacing(&(meta->mData), header.bytes);
|
|
WriteLacing(&(meta->mData), header_comm.bytes);
|
|
|
|
// Append the three packets
|
|
meta->mData.AppendElements(header.packet, header.bytes);
|
|
meta->mData.AppendElements(header_comm.packet, header_comm.bytes);
|
|
meta->mData.AppendElements(header_code.packet, header_code.bytes);
|
|
|
|
return meta.forget();
|
|
}
|
|
|
|
void
|
|
VorbisTrackEncoder::GetEncodedFrames(EncodedFrameContainer& aData)
|
|
{
|
|
// vorbis does some data preanalysis, then divvies up blocks for
|
|
// more involved (potentially parallel) processing. Get a single
|
|
// block for encoding now.
|
|
while (vorbis_analysis_blockout(&mVorbisDsp, &mVorbisBlock) == 1) {
|
|
ogg_packet oggPacket;
|
|
if (vorbis_analysis(&mVorbisBlock, &oggPacket) == 0) {
|
|
VORBISLOG("vorbis_analysis_blockout block size %d", oggPacket.bytes);
|
|
EncodedFrame* audiodata = new EncodedFrame();
|
|
audiodata->SetFrameType(EncodedFrame::VORBIS_AUDIO_FRAME);
|
|
audiodata->SetTimeStamp(oggPacket.granulepos * PR_USEC_PER_SEC
|
|
/ mSamplingRate);
|
|
nsTArray<uint8_t> frameData;
|
|
frameData.AppendElements(oggPacket.packet, oggPacket.bytes);
|
|
audiodata->SwapInFrameData(frameData);
|
|
aData.AppendEncodedFrame(audiodata);
|
|
}
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
VorbisTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
|
|
{
|
|
if (mEosSetInEncoder) {
|
|
return NS_OK;
|
|
}
|
|
|
|
PROFILER_LABEL("VorbisTrackEncoder", "GetEncodedTrack",
|
|
js::ProfileEntry::Category::OTHER);
|
|
|
|
nsAutoPtr<AudioSegment> sourceSegment;
|
|
sourceSegment = new AudioSegment();
|
|
{
|
|
// Move all the samples from mRawSegment to sourceSegment. We only hold
|
|
// the monitor in this block.
|
|
ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
|
|
// Wait if mEncoder is not initialized, or when not enough raw data, but is
|
|
// not the end of stream nor is being canceled.
|
|
while (!mCanceled && mRawSegment.GetDuration() < GetPacketDuration() &&
|
|
!mEndOfStream) {
|
|
mon.Wait();
|
|
}
|
|
VORBISLOG("GetEncodedTrack passes wait, duration is %lld\n",
|
|
mRawSegment.GetDuration());
|
|
if (mCanceled || mEncodingComplete) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
sourceSegment->AppendFrom(&mRawSegment);
|
|
}
|
|
|
|
if (mEndOfStream && (sourceSegment->GetDuration() == 0)
|
|
&& !mEosSetInEncoder) {
|
|
mEncodingComplete = true;
|
|
mEosSetInEncoder = true;
|
|
VORBISLOG("[Vorbis] Done encoding.");
|
|
vorbis_analysis_wrote(&mVorbisDsp, 0);
|
|
GetEncodedFrames(aData);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
// Start encoding data.
|
|
AudioSegment::ChunkIterator iter(*sourceSegment);
|
|
|
|
AudioDataValue **vorbisBuffer =
|
|
vorbis_analysis_buffer(&mVorbisDsp, (int)sourceSegment->GetDuration());
|
|
|
|
int framesCopied = 0;
|
|
AutoTArray<AudioDataValue, 9600> interleavedPcm;
|
|
AutoTArray<AudioDataValue, 9600> nonInterleavedPcm;
|
|
interleavedPcm.SetLength(sourceSegment->GetDuration() * mChannels);
|
|
nonInterleavedPcm.SetLength(sourceSegment->GetDuration() * mChannels);
|
|
while (!iter.IsEnded()) {
|
|
AudioChunk chunk = *iter;
|
|
int frameToCopy = chunk.GetDuration();
|
|
if (!chunk.IsNull()) {
|
|
InterleaveTrackData(chunk, frameToCopy, mChannels,
|
|
interleavedPcm.Elements() + framesCopied * mChannels);
|
|
} else { // empty data
|
|
memset(interleavedPcm.Elements() + framesCopied * mChannels, 0,
|
|
frameToCopy * mChannels * sizeof(AudioDataValue));
|
|
}
|
|
framesCopied += frameToCopy;
|
|
iter.Next();
|
|
}
|
|
// De-interleave the interleavedPcm.
|
|
DeInterleaveTrackData(interleavedPcm.Elements(), framesCopied, mChannels,
|
|
nonInterleavedPcm.Elements());
|
|
// Copy the nonInterleavedPcm to vorbis buffer.
|
|
for(uint8_t i = 0; i < mChannels; ++i) {
|
|
memcpy(vorbisBuffer[i], nonInterleavedPcm.Elements() + framesCopied * i,
|
|
framesCopied * sizeof(AudioDataValue));
|
|
}
|
|
|
|
// Now the vorbisBuffer contain the all data in non-interleaved.
|
|
// Tell the library how much we actually submitted.
|
|
vorbis_analysis_wrote(&mVorbisDsp, framesCopied);
|
|
VORBISLOG("vorbis_analysis_wrote framesCopied %d\n", framesCopied);
|
|
GetEncodedFrames(aData);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace mozilla
|