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)
381 lines
10 KiB
C++
381 lines
10 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/. */
|
|
|
|
#include "MediaDecoderReader.h"
|
|
#include "AbstractMediaDecoder.h"
|
|
#include "MediaResource.h"
|
|
#include "VideoUtils.h"
|
|
#include "ImageContainer.h"
|
|
|
|
#include "nsPrintfCString.h"
|
|
#include "mozilla/mozalloc.h"
|
|
#include <stdint.h>
|
|
#include <algorithm>
|
|
|
|
using namespace mozilla::media;
|
|
|
|
namespace mozilla {
|
|
|
|
// Un-comment to enable logging of seek bisections.
|
|
//#define SEEK_LOGGING
|
|
|
|
extern LazyLogModule gMediaDecoderLog;
|
|
#define DECODER_LOG(x, ...) \
|
|
MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
|
|
|
|
// Same workaround as MediaDecoderStateMachine.cpp.
|
|
#define DECODER_WARN_HELPER(a, b) NS_WARNING b
|
|
#define DECODER_WARN(x, ...) \
|
|
DECODER_WARN_HELPER(0, (nsPrintfCString("Decoder=%p " x, mDecoder, ##__VA_ARGS__).get()))
|
|
|
|
class VideoQueueMemoryFunctor : public nsDequeFunctor {
|
|
public:
|
|
VideoQueueMemoryFunctor() : mSize(0) {}
|
|
|
|
MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);
|
|
|
|
virtual void* operator()(void* aObject) {
|
|
const VideoData* v = static_cast<const VideoData*>(aObject);
|
|
mSize += v->SizeOfIncludingThis(MallocSizeOf);
|
|
return nullptr;
|
|
}
|
|
|
|
size_t mSize;
|
|
};
|
|
|
|
|
|
class AudioQueueMemoryFunctor : public nsDequeFunctor {
|
|
public:
|
|
AudioQueueMemoryFunctor() : mSize(0) {}
|
|
|
|
MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf);
|
|
|
|
virtual void* operator()(void* aObject) {
|
|
const AudioData* audioData = static_cast<const AudioData*>(aObject);
|
|
mSize += audioData->SizeOfIncludingThis(MallocSizeOf);
|
|
return nullptr;
|
|
}
|
|
|
|
size_t mSize;
|
|
};
|
|
|
|
MediaDecoderReader::MediaDecoderReader(AbstractMediaDecoder* aDecoder)
|
|
: mAudioCompactor(mAudioQueue)
|
|
, mDecoder(aDecoder)
|
|
, mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
|
|
/* aSupportsTailDispatch = */ true))
|
|
, mWatchManager(this, mTaskQueue)
|
|
, mBuffered(mTaskQueue, TimeIntervals(), "MediaDecoderReader::mBuffered (Canonical)")
|
|
, mDuration(mTaskQueue, NullableTimeUnit(), "MediaDecoderReader::mDuration (Mirror)")
|
|
, mIgnoreAudioOutputFormat(false)
|
|
, mHitAudioDecodeError(false)
|
|
, mShutdown(false)
|
|
, mAudioDiscontinuity(false)
|
|
, mVideoDiscontinuity(false)
|
|
{
|
|
MOZ_COUNT_CTOR(MediaDecoderReader);
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
// Dispatch initialization that needs to happen on that task queue.
|
|
nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethod(this, &MediaDecoderReader::InitializationTask);
|
|
mTaskQueue->Dispatch(r.forget());
|
|
}
|
|
|
|
void
|
|
MediaDecoderReader::InitializationTask()
|
|
{
|
|
if (!mDecoder) {
|
|
return;
|
|
}
|
|
if (mDecoder->CanonicalDurationOrNull()) {
|
|
mDuration.Connect(mDecoder->CanonicalDurationOrNull());
|
|
}
|
|
|
|
// Initialize watchers.
|
|
mWatchManager.Watch(mDuration, &MediaDecoderReader::UpdateBuffered);
|
|
}
|
|
|
|
MediaDecoderReader::~MediaDecoderReader()
|
|
{
|
|
MOZ_ASSERT(mShutdown);
|
|
ResetDecode();
|
|
MOZ_COUNT_DTOR(MediaDecoderReader);
|
|
}
|
|
|
|
size_t MediaDecoderReader::SizeOfVideoQueueInBytes() const
|
|
{
|
|
VideoQueueMemoryFunctor functor;
|
|
mVideoQueue.LockedForEach(functor);
|
|
return functor.mSize;
|
|
}
|
|
|
|
size_t MediaDecoderReader::SizeOfAudioQueueInBytes() const
|
|
{
|
|
AudioQueueMemoryFunctor functor;
|
|
mAudioQueue.LockedForEach(functor);
|
|
return functor.mSize;
|
|
}
|
|
|
|
size_t MediaDecoderReader::SizeOfVideoQueueInFrames()
|
|
{
|
|
return mVideoQueue.GetSize();
|
|
}
|
|
|
|
size_t MediaDecoderReader::SizeOfAudioQueueInFrames()
|
|
{
|
|
return mAudioQueue.GetSize();
|
|
}
|
|
|
|
nsresult MediaDecoderReader::ResetDecode()
|
|
{
|
|
VideoQueue().Reset();
|
|
AudioQueue().Reset();
|
|
|
|
mAudioDiscontinuity = true;
|
|
mVideoDiscontinuity = true;
|
|
|
|
mBaseAudioPromise.RejectIfExists(CANCELED, __func__);
|
|
mBaseVideoPromise.RejectIfExists(CANCELED, __func__);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::VideoDataPromise>
|
|
MediaDecoderReader::DecodeToFirstVideoData()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
typedef MediaDecoderReader::VideoDataPromise PromiseType;
|
|
RefPtr<PromiseType::Private> p = new PromiseType::Private(__func__);
|
|
RefPtr<MediaDecoderReader> self = this;
|
|
InvokeUntil([self] () -> bool {
|
|
MOZ_ASSERT(self->OnTaskQueue());
|
|
NS_ENSURE_TRUE(!self->mShutdown, false);
|
|
bool skip = false;
|
|
if (!self->DecodeVideoFrame(skip, 0)) {
|
|
self->VideoQueue().Finish();
|
|
return !!self->VideoQueue().PeekFront();
|
|
}
|
|
return true;
|
|
}, [self] () -> bool {
|
|
MOZ_ASSERT(self->OnTaskQueue());
|
|
return self->VideoQueue().GetSize();
|
|
})->Then(OwnerThread(), __func__, [self, p] () {
|
|
p->Resolve(self->VideoQueue().PeekFront(), __func__);
|
|
}, [p] () {
|
|
// We don't have a way to differentiate EOS, error, and shutdown here. :-(
|
|
p->Reject(END_OF_STREAM, __func__);
|
|
});
|
|
|
|
return p.forget();
|
|
}
|
|
|
|
void
|
|
MediaDecoderReader::UpdateBuffered()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
NS_ENSURE_TRUE_VOID(!mShutdown);
|
|
mBuffered = GetBuffered();
|
|
}
|
|
|
|
media::TimeIntervals
|
|
MediaDecoderReader::GetBuffered()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
if (!HaveStartTime()) {
|
|
return media::TimeIntervals();
|
|
}
|
|
AutoPinned<MediaResource> stream(mDecoder->GetResource());
|
|
|
|
if (!mDuration.Ref().isSome()) {
|
|
return TimeIntervals();
|
|
}
|
|
|
|
return GetEstimatedBufferedTimeRanges(stream, mDuration.Ref().ref().ToMicroseconds());
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::MetadataPromise>
|
|
MediaDecoderReader::AsyncReadMetadata()
|
|
{
|
|
typedef ReadMetadataFailureReason Reason;
|
|
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
DECODER_LOG("MediaDecoderReader::AsyncReadMetadata");
|
|
|
|
// Attempt to read the metadata.
|
|
RefPtr<MetadataHolder> metadata = new MetadataHolder();
|
|
nsresult rv = ReadMetadata(&metadata->mInfo, getter_Transfers(metadata->mTags));
|
|
|
|
// We're not waiting for anything. If we didn't get the metadata, that's an error.
|
|
if (NS_FAILED(rv) || !metadata->mInfo.HasValidMedia()) {
|
|
DECODER_WARN("ReadMetadata failed, rv=%x HasValidMedia=%d", rv, metadata->mInfo.HasValidMedia());
|
|
return MetadataPromise::CreateAndReject(Reason::METADATA_ERROR, __func__);
|
|
}
|
|
|
|
// Success!
|
|
return MetadataPromise::CreateAndResolve(metadata, __func__);
|
|
}
|
|
|
|
class ReRequestVideoWithSkipTask : public nsRunnable
|
|
{
|
|
public:
|
|
ReRequestVideoWithSkipTask(MediaDecoderReader* aReader,
|
|
int64_t aTimeThreshold)
|
|
: mReader(aReader)
|
|
, mTimeThreshold(aTimeThreshold)
|
|
{
|
|
}
|
|
|
|
NS_METHOD Run()
|
|
{
|
|
MOZ_ASSERT(mReader->OnTaskQueue());
|
|
|
|
// Make sure ResetDecode hasn't been called in the mean time.
|
|
if (!mReader->mBaseVideoPromise.IsEmpty()) {
|
|
mReader->RequestVideoData(/* aSkip = */ true, mTimeThreshold);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
RefPtr<MediaDecoderReader> mReader;
|
|
const int64_t mTimeThreshold;
|
|
};
|
|
|
|
class ReRequestAudioTask : public nsRunnable
|
|
{
|
|
public:
|
|
explicit ReRequestAudioTask(MediaDecoderReader* aReader)
|
|
: mReader(aReader)
|
|
{
|
|
}
|
|
|
|
NS_METHOD Run()
|
|
{
|
|
MOZ_ASSERT(mReader->OnTaskQueue());
|
|
|
|
// Make sure ResetDecode hasn't been called in the mean time.
|
|
if (!mReader->mBaseAudioPromise.IsEmpty()) {
|
|
mReader->RequestAudioData();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
private:
|
|
RefPtr<MediaDecoderReader> mReader;
|
|
};
|
|
|
|
RefPtr<MediaDecoderReader::VideoDataPromise>
|
|
MediaDecoderReader::RequestVideoData(bool aSkipToNextKeyframe,
|
|
int64_t aTimeThreshold)
|
|
{
|
|
RefPtr<VideoDataPromise> p = mBaseVideoPromise.Ensure(__func__);
|
|
bool skip = aSkipToNextKeyframe;
|
|
while (VideoQueue().GetSize() == 0 &&
|
|
!VideoQueue().IsFinished()) {
|
|
if (!DecodeVideoFrame(skip, aTimeThreshold)) {
|
|
VideoQueue().Finish();
|
|
} else if (skip) {
|
|
// We still need to decode more data in order to skip to the next
|
|
// keyframe. Post another task to the decode task queue to decode
|
|
// again. We don't just decode straight in a loop here, as that
|
|
// would hog the decode task queue.
|
|
RefPtr<nsIRunnable> task(new ReRequestVideoWithSkipTask(this, aTimeThreshold));
|
|
mTaskQueue->Dispatch(task.forget());
|
|
return p;
|
|
}
|
|
}
|
|
if (VideoQueue().GetSize() > 0) {
|
|
RefPtr<VideoData> v = VideoQueue().PopFront();
|
|
if (v && mVideoDiscontinuity) {
|
|
v->mDiscontinuity = true;
|
|
mVideoDiscontinuity = false;
|
|
}
|
|
mBaseVideoPromise.Resolve(v, __func__);
|
|
} else if (VideoQueue().IsFinished()) {
|
|
mBaseVideoPromise.Reject(END_OF_STREAM, __func__);
|
|
} else {
|
|
MOZ_ASSERT(false, "Dropping this promise on the floor");
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::AudioDataPromise>
|
|
MediaDecoderReader::RequestAudioData()
|
|
{
|
|
RefPtr<AudioDataPromise> p = mBaseAudioPromise.Ensure(__func__);
|
|
while (AudioQueue().GetSize() == 0 &&
|
|
!AudioQueue().IsFinished()) {
|
|
if (!DecodeAudioData()) {
|
|
AudioQueue().Finish();
|
|
break;
|
|
}
|
|
// AudioQueue size is still zero, post a task to try again. Don't spin
|
|
// waiting in this while loop since it somehow prevents audio EOS from
|
|
// coming in gstreamer 1.x when there is still video buffer waiting to be
|
|
// consumed. (|mVideoSinkBufferCount| > 0)
|
|
if (AudioQueue().GetSize() == 0) {
|
|
RefPtr<nsIRunnable> task(new ReRequestAudioTask(this));
|
|
mTaskQueue->Dispatch(task.forget());
|
|
return p;
|
|
}
|
|
}
|
|
if (AudioQueue().GetSize() > 0) {
|
|
RefPtr<AudioData> a = AudioQueue().PopFront();
|
|
if (mAudioDiscontinuity) {
|
|
a->mDiscontinuity = true;
|
|
mAudioDiscontinuity = false;
|
|
}
|
|
mBaseAudioPromise.Resolve(a, __func__);
|
|
} else if (AudioQueue().IsFinished()) {
|
|
mBaseAudioPromise.Reject(mHitAudioDecodeError ? DECODE_ERROR : END_OF_STREAM, __func__);
|
|
mHitAudioDecodeError = false;
|
|
} else {
|
|
MOZ_ASSERT(false, "Dropping this promise on the floor");
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
void
|
|
MediaDecoderReader::BreakCycles()
|
|
{
|
|
// Nothing left to do here these days. We keep this method around so that, if
|
|
// we need it, we don't have to make all of the subclass implementations call
|
|
// the superclass method again.
|
|
}
|
|
|
|
RefPtr<ShutdownPromise>
|
|
MediaDecoderReader::Shutdown()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
mShutdown = true;
|
|
|
|
mBaseAudioPromise.RejectIfExists(END_OF_STREAM, __func__);
|
|
mBaseVideoPromise.RejectIfExists(END_OF_STREAM, __func__);
|
|
|
|
ReleaseMediaResources();
|
|
mDuration.DisconnectIfConnected();
|
|
mBuffered.DisconnectAll();
|
|
|
|
// Shut down the watch manager before shutting down our task queue.
|
|
mWatchManager.Shutdown();
|
|
|
|
RefPtr<ShutdownPromise> p;
|
|
|
|
mDecoder = nullptr;
|
|
|
|
return mTaskQueue->BeginShutdown();
|
|
}
|
|
|
|
} // namespace mozilla
|
|
|
|
#undef DECODER_LOG
|
|
#undef DECODER_WARN
|
|
#undef DECODER_WARN_HELPER
|