mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
147c5fa2eb
- Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe (3c954c73dd) - Bug 1223486 - Ensure WrapTexCoord returns 0.0 instead of 1.0 when given a negative whole number. r=Bas (b4af8eb524) - Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin (03359c7730) - Bug 1206763 - Enable SkiaGL canvas on gonk r=mattwoodrow (1588079b23) - Decouple CairoImage from ImageContainer. (bug 1222910, r=roc) (a93a4dad82) - Decouple D3D11ShareHandleImage from ImageContainer. (bug 1222910, r=mattwoodrow) (9642ef1c53) - Bug 1194753 - Wait longer when decoding the first frame of D3D9 DXVA video before deciding it is invalid. r=cpearce (865fe1d2f3) - Decouple D3D9SurfaceImage from ImageContainer. (bug 1222910, r=mattwoodrow) (55bc5abffc) - Bug 1191534 - Implement BlitImageToFramebuffer for IOSurface. r=jgilbert (0da6aff77f) - Decouple EGLImageImage from ImageContainer. (bug 1222910, r=snorp) (cffb7aadcb) - Decouple SurfaceTextureImage from ImageContainer. (bug 1222910, r=snorp) (5b920014d0) - Decouple MacIOSurfaceImage from ImageContainer. (bug 1222910, r=mstange) (ffab69155c) - Decouple SharedRGBImage and PlanarYCbCrImage from ImageContainer. (bug 1222910, r=mattwoodrow) (a9f6e23788) - Remove Gonk usage of ImageContainer::CreateImage. (bug 1222910, r=sotaro) (3f460b901d) - Remove CreateImage() from ImageContainer, ImageFactory, and ImageClient. (bug 1222910, r=roc) (873d5d5e47) - Bug 1212795: P1. Ensure the check if HW acceleration is allowed is performed on the main thread. r=jwwang (7cac257e5a) - Bug 1137529: Prefer Apple's VDA hardware acceleration for Hi-Def videos. r=rillian (a3ffc48e5e) - Bug 1212795: P2. Ensure all frameworks required for video decoding on mac are loaded. r=jwwang (b903b94c60) - Bug 1212795: P3. Make AppleDecoderModule detects if the required modules are loaded. r=jwwang (fb132e36b0) - Bug 1221991 - [1.3] Make SupportsMimeType a const function. r=jya (2450030808) - Bug 1221991 - [2.3] Split DecoderLoop into functions, simplify decoding state and clean up style. r=snorp (7c0e665cf7) - Bug 1221991 - [3.1] Manage module state via accessor functions. r=snorp (491b00f74b) - Bug 1221991 - [4.2] Add AndroidDecoderModule logging. r=snorp (7213505016) - Bug 1153110: Don't prefer VDA for 720p and above. r=rillian (50d5fbfa7c) - remove PR_LOGGING (44f4efbaa2) - Bug 1169653 - Limit use of the speech recognition API in JS to certified apps or apps with the proper flags set. r=smaug (c93a8949b8) - Bug 1133633: Part2. Enable async decoding on mac. r=mattmoodrow (c9740168bd) - Bug 1154896: Report decoding errors back to MP4Reader. r=rillian (26291f72e1) - Bug 1154896: Part2. Ignore kVTDecodeInfo_FrameDropped flag. r=rillian (bfca4c264e) - Bug 1198094: P1. Limit rate at which InputExhausted could be called by mac decoder. r=rillian (e5819c1666) - Bug 1214678 - Allow Apple media decoders to work on iOS r=jya (c475eff0be) - Bug 1219140 - Remove AskMediaCodecAndWait() r=bwu (dbe8d364ec) - fix includes (432c3419b0) - adapted Bug 1159509 - Support audio AMR-NB for Gonk in MP4Reader. r=jya (adaddc5c21) - Bug 1154512 - Remove MediaTaskQueue::SyncDispatch() from PDM. r=cpearce (5bddd082bd) - Bug 1204622 - release codec listener at reader task queue. r=jya (72b062b5d7) - Bug 1097498 - Wait fence for the graphic buffer. r=sotaro (c72f301939) - Bug 1198664 - Refactor: move common behaviors to base class. r=bwu,jya (a754813c5b) - Bug 1198664 - Use looper to process decoder tasks. r=bwu (768315de13) - Bug 1174721 - Use AudioCompactor for GonkAudioDecoderManager. r=sotaro (768e68c946) - Bug 1199809 - Refactor: use RAII to help manage output buffer lifecycle. r=sotaro (9a6e0dceb7) - Bug 1133955 - Record the last seek time to decide the direction to seek. r=sotaro (d0bcdbe68b) - Bug 1210045 - Fix GonkVideoDecoderManager shutdown during initialization r=bwu (b379248ff1) - Bug 1214997 - Use MozPromise in MediaCodecProxy and OMXCodecProxy r=bwu (ab9a92d640) - Bug 1199809 - Make a copy of output buffer after flush(). r=sotaro (17465ecaea) - Bug 1216895 - assert that decoder methods are run on correct thread. r=jya (b8c106c2ca) - Bug 1185018 - Part 1 of 1 - Made speech recognition services language dependent and removed assumption of a single service. r=smaug (f83acf82b4) - Bug 1207416: Add Telemetry for time spent in different Load states in WebRTC r=gcp (e3959b6760) - Bug 1219480 - Replace PRLogModuleInfo with LazyLogModule in the media directory. r=rillian (a9b13ef334) - Bug 1196558: Don't assert should output task not be dispatched. r=edwin (a2569bca73) - Bug 1199193: Ensure DrainComplete() is called once all decoded frames have been output. r=rillian (760fb42753) - Bug 1079621 - Change non-fatal errors to warnings. r=rillian (20c85e7e56) - Bug 1185234 - Implement SpeechRecognition::interimResults. r=smaug (b3d635d8c0) - Bug 1171850 - Remove 'models' dir from MODELSPS_DEST as the dir 'models' now comes from MODELSPS_FILES. r=gps (5515511e3a) - Bug 1183503 - Rename model and dictionary files for recognition in preparation for localization. r=smaug (32c78610af) - Bug 1185235 - Implement SpeechRecognition::maxAlternatives. r=smaug (91eac7f30f) - Bug 1177514 - Remove final text of 'ERROR' on recognition error, should be signaled by SpeechRecognitionError. r=smaug (c8d7b198e0) - Bug 1187791 - Part 1 of 1 - SpeechRecognition::maxAlternatives can't throw; so, rm webidl throws specifier. r=smaug (e295b2bde5) - Bug 1213131: [vpx] Configure libvpx decoder to use multi-threads decoding. r=kentuckyfriedtakahe (f38ba0ef82) - Bug 1206845: Prevent overflows in MediaCache. r=roc (e8a228dcd3) - Bug 1205825 - part 1 - don't reacquire the media cache's monitor in MediaCacheStream::FlushPartialBlockInternal; r=roc (6342592be3) - Bug 1205825 - part 2 - call Get*CachedData*Internal variants from MediaCacheStream::GetCachedRanges; r=roc (f229c8f757)
239 lines
7.8 KiB
C++
239 lines
7.8 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);
|
|
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;
|
|
nsAutoTArray<AudioDataValue, 9600> interleavedPcm;
|
|
nsAutoTArray<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
|