mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:23:07 +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)
312 lines
9.6 KiB
C++
312 lines
9.6 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et cindent: */
|
|
/* 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 "OpusDecoder.h"
|
|
#include "TimeUnits.h"
|
|
#include "VorbisUtils.h"
|
|
#include "mozilla/Endian.h"
|
|
|
|
#include <stdint.h>
|
|
#include <inttypes.h> // For PRId64
|
|
|
|
extern mozilla::LogModule* GetPDMLog();
|
|
#define OPUS_DEBUG(arg, ...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, \
|
|
("OpusDataDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
|
|
|
|
namespace mozilla {
|
|
|
|
OpusDataDecoder::OpusDataDecoder(const AudioInfo& aConfig,
|
|
FlushableTaskQueue* aTaskQueue,
|
|
MediaDataDecoderCallback* aCallback)
|
|
: mInfo(aConfig)
|
|
, mTaskQueue(aTaskQueue)
|
|
, mCallback(aCallback)
|
|
, mOpusDecoder(nullptr)
|
|
, mSkip(0)
|
|
, mDecodedHeader(false)
|
|
, mPaddingDiscarded(false)
|
|
, mFrames(0)
|
|
{
|
|
}
|
|
|
|
OpusDataDecoder::~OpusDataDecoder()
|
|
{
|
|
if (mOpusDecoder) {
|
|
opus_multistream_decoder_destroy(mOpusDecoder);
|
|
mOpusDecoder = nullptr;
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
OpusDataDecoder::Shutdown()
|
|
{
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<MediaDataDecoder::InitPromise>
|
|
OpusDataDecoder::Init()
|
|
{
|
|
size_t length = mInfo.mCodecSpecificConfig->Length();
|
|
uint8_t *p = mInfo.mCodecSpecificConfig->Elements();
|
|
if (length < sizeof(uint64_t)) {
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
int64_t codecDelay = BigEndian::readUint64(p);
|
|
length -= sizeof(uint64_t);
|
|
p += sizeof(uint64_t);
|
|
if (NS_FAILED(DecodeHeader(p, length))) {
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
int r;
|
|
mOpusDecoder = opus_multistream_decoder_create(mOpusParser->mRate,
|
|
mOpusParser->mChannels,
|
|
mOpusParser->mStreams,
|
|
mOpusParser->mCoupledStreams,
|
|
mOpusParser->mMappingTable,
|
|
&r);
|
|
mSkip = mOpusParser->mPreSkip;
|
|
mPaddingDiscarded = false;
|
|
|
|
if (codecDelay != FramesToUsecs(mOpusParser->mPreSkip,
|
|
mOpusParser->mRate).value()) {
|
|
NS_WARNING("Invalid Opus header: CodecDelay and pre-skip do not match!");
|
|
return InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
if (mInfo.mRate != (uint32_t)mOpusParser->mRate) {
|
|
NS_WARNING("Invalid Opus header: container and codec rate do not match!");
|
|
}
|
|
if (mInfo.mChannels != (uint32_t)mOpusParser->mChannels) {
|
|
NS_WARNING("Invalid Opus header: container and codec channels do not match!");
|
|
}
|
|
|
|
return r == OPUS_OK ? InitPromise::CreateAndResolve(TrackInfo::kAudioTrack, __func__)
|
|
: InitPromise::CreateAndReject(DecoderFailureReason::INIT_ERROR, __func__);
|
|
}
|
|
|
|
nsresult
|
|
OpusDataDecoder::DecodeHeader(const unsigned char* aData, size_t aLength)
|
|
{
|
|
MOZ_ASSERT(!mOpusParser);
|
|
MOZ_ASSERT(!mOpusDecoder);
|
|
MOZ_ASSERT(!mDecodedHeader);
|
|
mDecodedHeader = true;
|
|
|
|
mOpusParser = new OpusParser;
|
|
if (!mOpusParser->DecodeHeader(const_cast<unsigned char*>(aData), aLength)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
// No channel mapping for more than 8 channels.
|
|
if (mOpusParser->mChannels > 8) {
|
|
OPUS_DEBUG("No channel mapping for more than 8 channels. Source is %d channels",
|
|
mOpusParser->mChannels);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
OpusDataDecoder::Input(MediaRawData* aSample)
|
|
{
|
|
nsCOMPtr<nsIRunnable> runnable(
|
|
NS_NewRunnableMethodWithArg<RefPtr<MediaRawData>>(
|
|
this, &OpusDataDecoder::Decode,
|
|
RefPtr<MediaRawData>(aSample)));
|
|
mTaskQueue->Dispatch(runnable.forget());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
OpusDataDecoder::Decode(MediaRawData* aSample)
|
|
{
|
|
if (DoDecode(aSample) == -1) {
|
|
mCallback->Error();
|
|
} else if(mTaskQueue->IsEmpty()) {
|
|
mCallback->InputExhausted();
|
|
}
|
|
}
|
|
|
|
int
|
|
OpusDataDecoder::DoDecode(MediaRawData* aSample)
|
|
{
|
|
int64_t aDiscardPadding = 0;
|
|
if (aSample->mExtraData) {
|
|
aDiscardPadding = BigEndian::readInt64(aSample->mExtraData->Elements());
|
|
}
|
|
uint32_t channels = mOpusParser->mChannels;
|
|
|
|
if (mPaddingDiscarded) {
|
|
// Discard padding should be used only on the final packet, so
|
|
// decoding after a padding discard is invalid.
|
|
OPUS_DEBUG("Opus error, discard padding on interstitial packet");
|
|
return -1;
|
|
}
|
|
|
|
// Maximum value is 63*2880, so there's no chance of overflow.
|
|
int32_t frames_number = opus_packet_get_nb_frames(aSample->Data(),
|
|
aSample->Size());
|
|
if (frames_number <= 0) {
|
|
OPUS_DEBUG("Invalid packet header: r=%ld length=%ld",
|
|
frames_number, aSample->Size());
|
|
return -1;
|
|
}
|
|
|
|
int32_t samples = opus_packet_get_samples_per_frame(aSample->Data(),
|
|
opus_int32(mOpusParser->mRate));
|
|
|
|
|
|
// A valid Opus packet must be between 2.5 and 120 ms long (48kHz).
|
|
int32_t frames = frames_number*samples;
|
|
if (frames < 120 || frames > 5760) {
|
|
OPUS_DEBUG("Invalid packet frames: %ld", frames);
|
|
return -1;
|
|
}
|
|
|
|
auto buffer = MakeUnique<AudioDataValue[]>(frames * channels);
|
|
|
|
// Decode to the appropriate sample type.
|
|
#ifdef MOZ_SAMPLE_TYPE_FLOAT32
|
|
int ret = opus_multistream_decode_float(mOpusDecoder,
|
|
aSample->Data(), aSample->Size(),
|
|
buffer.get(), frames, false);
|
|
#else
|
|
int ret = opus_multistream_decode(mOpusDecoder,
|
|
aSample->Data(), aSample->Size(),
|
|
buffer.get(), frames, false);
|
|
#endif
|
|
if (ret < 0) {
|
|
return -1;
|
|
}
|
|
NS_ASSERTION(ret == frames, "Opus decoded too few audio samples");
|
|
CheckedInt64 startTime = aSample->mTime;
|
|
|
|
// Trim the initial frames while the decoder is settling.
|
|
if (mSkip > 0) {
|
|
int32_t skipFrames = std::min<int32_t>(mSkip, frames);
|
|
int32_t keepFrames = frames - skipFrames;
|
|
OPUS_DEBUG("Opus decoder skipping %d of %d frames", skipFrames, frames);
|
|
PodMove(buffer.get(),
|
|
buffer.get() + skipFrames * channels,
|
|
keepFrames * channels);
|
|
startTime = startTime + FramesToUsecs(skipFrames, mOpusParser->mRate);
|
|
frames = keepFrames;
|
|
mSkip -= skipFrames;
|
|
}
|
|
|
|
if (aDiscardPadding < 0) {
|
|
// Negative discard padding is invalid.
|
|
OPUS_DEBUG("Opus error, negative discard padding");
|
|
return -1;
|
|
}
|
|
if (aDiscardPadding > 0) {
|
|
OPUS_DEBUG("OpusDecoder discardpadding %" PRId64 "", aDiscardPadding);
|
|
CheckedInt64 discardFrames =
|
|
TimeUnitToFrames(media::TimeUnit::FromNanoseconds(aDiscardPadding),
|
|
mOpusParser->mRate);
|
|
if (!discardFrames.isValid()) {
|
|
NS_WARNING("Int overflow in DiscardPadding");
|
|
return -1;
|
|
}
|
|
if (discardFrames.value() > frames) {
|
|
// Discarding more than the entire packet is invalid.
|
|
OPUS_DEBUG("Opus error, discard padding larger than packet");
|
|
return -1;
|
|
}
|
|
OPUS_DEBUG("Opus decoder discarding %d of %d frames",
|
|
int32_t(discardFrames.value()), frames);
|
|
// Padding discard is only supposed to happen on the final packet.
|
|
// Record the discard so we can return an error if another packet is
|
|
// decoded.
|
|
mPaddingDiscarded = true;
|
|
int32_t keepFrames = frames - discardFrames.value();
|
|
frames = keepFrames;
|
|
}
|
|
|
|
// Apply the header gain if one was specified.
|
|
#ifdef MOZ_SAMPLE_TYPE_FLOAT32
|
|
if (mOpusParser->mGain != 1.0f) {
|
|
float gain = mOpusParser->mGain;
|
|
int samples = frames * channels;
|
|
for (int i = 0; i < samples; i++) {
|
|
buffer[i] *= gain;
|
|
}
|
|
}
|
|
#else
|
|
if (mOpusParser->mGain_Q16 != 65536) {
|
|
int64_t gain_Q16 = mOpusParser->mGain_Q16;
|
|
int samples = frames * channels;
|
|
for (int i = 0; i < samples; i++) {
|
|
int32_t val = static_cast<int32_t>((gain_Q16*buffer[i] + 32768)>>16);
|
|
buffer[i] = static_cast<AudioDataValue>(MOZ_CLIP_TO_15(val));
|
|
}
|
|
}
|
|
#endif
|
|
|
|
CheckedInt64 duration = FramesToUsecs(frames, mOpusParser->mRate);
|
|
if (!duration.isValid()) {
|
|
NS_WARNING("OpusDataDecoder: Int overflow converting WebM audio duration");
|
|
return -1;
|
|
}
|
|
CheckedInt64 time = startTime - FramesToUsecs(mOpusParser->mPreSkip,
|
|
mOpusParser->mRate);
|
|
if (!time.isValid()) {
|
|
NS_WARNING("OpusDataDecoder: Int overflow shifting tstamp by codec delay");
|
|
return -1;
|
|
};
|
|
|
|
mCallback->Output(new AudioData(aSample->mOffset,
|
|
time.value(),
|
|
duration.value(),
|
|
frames,
|
|
Move(buffer),
|
|
mOpusParser->mChannels,
|
|
mOpusParser->mRate));
|
|
mFrames += frames;
|
|
return frames;
|
|
}
|
|
|
|
void
|
|
OpusDataDecoder::DoDrain()
|
|
{
|
|
mCallback->DrainComplete();
|
|
}
|
|
|
|
nsresult
|
|
OpusDataDecoder::Drain()
|
|
{
|
|
RefPtr<nsIRunnable> runnable(
|
|
NS_NewRunnableMethod(this, &OpusDataDecoder::DoDrain));
|
|
mTaskQueue->Dispatch(runnable.forget());
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
OpusDataDecoder::Flush()
|
|
{
|
|
mTaskQueue->Flush();
|
|
if (mOpusDecoder) {
|
|
// Reset the decoder.
|
|
opus_multistream_decoder_ctl(mOpusDecoder, OPUS_RESET_STATE);
|
|
mSkip = mOpusParser->mPreSkip;
|
|
mPaddingDiscarded = false;
|
|
mFrames = 0;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
/* static */
|
|
bool
|
|
OpusDataDecoder::IsOpus(const nsACString& aMimeType)
|
|
{
|
|
return aMimeType.EqualsLiteral("audio/ogg; codecs=opus");
|
|
}
|
|
|
|
} // namespace mozilla
|
|
#undef OPUS_DEBUG
|