mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
93f846cd1f
- Bug 1275016 - Rename Endian.h to EndianUtils.h to avoid #include confusion with Android's endian.h stdlib header. r=froydnj (b54a25f572) - add crashreporter stuff (aa7ef15337) - Bug 1261168 - Add AlignedAutoTArray type in Web Audio; r=padenot (285d2cb88b) - Bug 1273390. Part 1 - move some functions to private. r=jya. (07a3037e59) - Bug 1273390. Part 2 - add assertions. r=jya. (2cae7c596a) - Bug 1273390. Part 3 - rename some functions to be consistent with other sub-classes of MediaDataDecoder. r=jya. (c48c7060ce) - Bug 1273390. Part 4 - remove use of FlushableTaskQueue::Flush(). r=jya. (00565a65f4) - Bug 1273390. Part 5 - remove use of FlushableTaskQueue. r=jya. (30600b204e) - Bug 1273774. Part 1 - remove unused members and thread assertions. r=jya (f5177ed641) - Bug 1273774. Part 2 - do decoding jobs synchronously without dispatching. r=jya. (62d840d27c) - Bug 1273774. Part 3 - remove members no longer used. r=jya. (e957ca512a) - Bug 1244410: [ffmpeg] Ensure the last drained frame has the proper duration set. r=gerald (d5521bfdd4) - Bug 1271508. Part 1 - refactor FFmpegAudioDecoder code to be similar to FFmpegVideoDecoder::Input() so it would be easier to extract common code to the parent class. r=jya. (613e6c624c) - Bug 1271508. Part 2 - rename functions so they are the same as those of FFmpegAudioDecoder so it would be easier to extract common code to the parent class. r=jya. (cb281cba26) - Bug 1270350 - per comment 0, use SyncRunnable to repalce the boilerplate code. r=jya. (b99460e571) - Bug 1271508. Part 3 - extract code to the parent class and remove use of mTaskQueue from sub-classes. r=jya. (2a7ff4dd1e) - Bug 1274216 - remove use of FlushableTaskQueue from PlatformDecoderModule. r=jya. (eb160c5fa2) - Bug 1271517. Part 1 - remove use of FlushableTaskQueue::Flush() from FFmpegDataDecoder::Flush(). r=jya. (fdf10da4ab) - Bug 1271517. Part 2 - remove use of FlushableTaskQueue. r=jya. (a7016d8506) - Bug 1273397. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (7eecb164be) - Bug 1273397. Part 2 - constify some members. r=jya. (e4482f9a23) - Bug 1273397. Part 3 - remove use of FlushableTaskQueue::Flush(). r=jya. (0b7ee073fe) - Bug 1273397. Part 4 - remove use of FlushableTaskQueue. r=jya. (6a612161d5) - Bug 1273397. Part 5 - add assertions. r=jya. (ff3a62a6fb) - Bug 1274199 - remove use of FlushableTaskQueue. r=cpearce. (adc4c84ede) - Bug 1273405. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (af123d6c21) - Bug 1273405. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (2d144bfbcd) - Bug 1273405. Part 3 - remove use of FlushableTaskQueue. r=jya. (1e9ea3c2c7) - Bug 1273405. Part 4 - add assertions. r=jya. (b400647323) - Bug 1271491: [WMF] P1. Don't use main thread only preferences methods. r=cpearce (7177454dfb) - Bug 1262427. Don't try D3D11 harder. r=dvander (404147d6fa) - Use gfxConfig for D3D9 preferences. (bug 1270650, r=jrmuizel) (40d89c154c) - Bug 1271491: P2. Allow initialization of WMFPlatformDecoderModule from any threads. r=mattwoodrow (c8fe0bf009) - Bug 1271491: P3. Remove refcounting the number of time apple's linkers are called. r=cpearce (0324ffe876) - Bug 1271491: [ffmpeg] P4. Remove requirements to call Init on the main thread. r=cpearce (b511d7dfd5) - Bug 1271491: [GMP] P5. Allow GMPDecoderModule::Init() to be called off the main thread. r=cpearce (2131eb0b2e) - Bug 1266102 - Don't run VP9 benchmark on Android r=jya (57d7b573fe) - Bug 1271491: P6. Remove the need to call PDMFactory::Init(). r=cpearce (5726cfe49c) - Bug 1271491: P7. Remove unused members. r=alfredo (0f8a9dde73) - Bug 1268905 - Disable D3D11 with some Toshiba DLLs - r=cpearce (b5bf77442e) - Bug 1269204 - Disable D3D11 with idg10umd32 9.17.10.2857 - r=cpearce (7eb6a3d96b) - Bug 1273406 - Disable D3D11 with some iSonyVideoProcessor DLLs - r=cpearce (d9b6f0cefe) - Bug 1273406 - Ugly macros transform into beautiful constexpr goodness - r=cpearce (0671483695) - Bug 1273691 - Implement 'media.wmf.disable-d3d11-for-dlls' pref - r=cpearce (193ae53070) - Bug 1272225. Part 1 - add assertions to make thread constraints clear. r=jya. (83c620470e) - Bug 1272225. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (9473e092d1) - Bug 1272553. Part 1 - move code around to be able to extract common code in P2. r=jya. (d727f97ee8) - Bug 1272553. Part 2 - extract common code to the parent class. r=jya. (2fb3cd4bd9) - Bug 1272553. Part 3 - make mTaskQueue private. r=jya. (93fea98cb6) - Bug 1272232. Part 1 - move code around so we can extract common code in P2. r=jya. (8cdaab9078) - Bug 1272232. Part 2 - extract common code to the parent class. r=jya. (27156668b3) - Bug 1272232. Part 3 - constify some members and make them private when possible. r=jya. (550b963d97) - Bug 1272232. Part 4 - remove use of FlushableTaskQueue::Flush(). r=jya. (bdbfdeb6bc) - Bug 1272232. Part 5 - remove use of FlushableTaskQueue. r=jya. (640f889a9d) - Bug 1274913 - Move PDM log definition to header. r=njn (823b07f42b) - Bug 1275538: P1. Abort early if a skip request is in progress. r=gerald,kamidphish (d67b8a2236) - Bug 1272422 - Part 1: Expose control of suspending background video. r=cpearce (ec7193773f) - Bug 1272422 - Part 2: Vidoe -> Video. r=cpearce (97390aee69) - Bug 1272422 - Part 3: Don't reset audio queue. r=jya (e183db1062) - Bug 1272964: P1. Only activate skip to next keyframe logic when next keyframe time is known. r=gerald (1be74df027) - Bug 1272964: P2. Don't activate skip to next keyframe until we passed the internal seek target. r=gerald (c55b6ae003) - Bug 1258922: [MSE] P1. Initialise variable. r=gerald (56a5acb345) - Bug 1258922: [MSE] P2. Do not go over gap when attempting to find the next key frame. r=gerald (db1319f080) - Bug 1258922: [MSE] P3. Check that the data we are attempting to skip to is buffered. r=gerald (621d71d5d6) - Bug 1258922: [MSE] P4. Set draining flag to true when skip to next keyframe failed. r=gerald (6c75613faf) - Bug 1272916: [MSE] P1. Don't rely only on dts gap to establish if we have a gap in our source buffer. r=gerald (8770113b83) - Bug 1272964: [MSE] P3. Do not skip over gaps when searching for the next keyframe. r=gerald (76916c5ac6) - Bug 1272964: P4. Only flush decoder if skip to next keyframe actually succeeds. r=cpearce (5394708eef) - Bug 1270323: P1. Don't reset flag indicating that new data was received. r=cpearce (d32f06ef34) - Bug 1270323: P2. Don't process new incoming data while a skip to next keyframe is pending. r=cpearce (bca7909de9) - Bug 1270323: [ffmpeg] P3. Use the dts of the last sample input, not the dts of the last decoded sample (0d768c33ef) - Bug 1270323: P4. Don't drain decoder if we're already waiting for new data. r=cpearce (679302cb6e) - Bug 1270323: P5. Prevent potential null deref. r=cpearce (cc63270e06) - Bug 1275538: P2. Drop decoded frames that we know are already too late. r=kamidphish (4e7af9398c) - Bug 1273018: P1. Rename some members. r=gerald (3a92fbd994) - Bug 1273018: P2. Don't reject audio waiting promise when performing a video only seek. r=gerald (34e4988db1) - Bug 1273018: P3. Adjust range of audio assertions. r=gerald (feb2afd0ae) - Bug 1249706 - Backout a085ea2d24bb for blowing telemetry server's mind. r=backout (d61fb51f52) - Bug 1249706 - Fix 8fe22dd4fc8a (backout of a085ea2d24bb). r=bustage (ba65251db7) - Bug 1272964: [MSE] P5. Default to skipping to the next keyframe if no keyframe was found past currentTime. (29086fcf56) - Bug 1272964: P6. Exclude frames dropped due to internal seeking from calculations. r=cpearce (bf6faa7612) - Bug 1068151 - keep decoding a corrupted video. r=jya (3b5462e5b6) - Bug 1273947 - Update ResetDecode() to ResetDecode(TargetQueue) r=jya (6c28d46974) - Bug 1277508: P1. Don't attempt to demux new samples while we're currently draining. r=kamidphish (64f200b921) - Bug 1274933: Reject data promise when EOS is encountered following waiting for data. r=gerald (5bba4a7853) - Bug 1277508: P2. Add HasPendingDrain convenience method. r=kamidphish (3d89a90a97)
331 lines
10 KiB
C++
331 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/. */
|
|
|
|
#ifndef MediaDecoderReaderWrapper_h_
|
|
#define MediaDecoderReaderWrapper_h_
|
|
|
|
#include "mozilla/AbstractThread.h"
|
|
#include "mozilla/RefPtr.h"
|
|
#include "nsISupportsImpl.h"
|
|
|
|
#include "MediaDecoderReader.h"
|
|
#include "MediaCallbackID.h"
|
|
|
|
namespace mozilla {
|
|
|
|
class StartTimeRendezvous;
|
|
|
|
typedef MozPromise<bool, bool, /* isExclusive = */ false> HaveStartTimePromise;
|
|
|
|
/**
|
|
* A wrapper around MediaDecoderReader to offset the timestamps of Audio/Video
|
|
* samples by the start time to ensure MDSM can always assume zero start time.
|
|
* It also adjusts the seek target passed to Seek() to ensure correct seek time
|
|
* is passed to the underlying reader.
|
|
*/
|
|
class MediaDecoderReaderWrapper {
|
|
typedef MediaDecoderReader::MetadataPromise MetadataPromise;
|
|
typedef MediaDecoderReader::MediaDataPromise MediaDataPromise;
|
|
typedef MediaDecoderReader::SeekPromise SeekPromise;
|
|
typedef MediaDecoderReader::WaitForDataPromise WaitForDataPromise;
|
|
typedef MediaDecoderReader::BufferedUpdatePromise BufferedUpdatePromise;
|
|
typedef MediaDecoderReader::TargetQueues TargetQueues;
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaDecoderReaderWrapper);
|
|
|
|
/*
|
|
* Type 1: void(MediaData*)
|
|
* void(RefPtr<MediaData>)
|
|
*/
|
|
template <typename T>
|
|
class ArgType1CheckHelper {
|
|
template<typename C, typename... Ts>
|
|
static TrueType
|
|
test(void(C::*aMethod)(Ts...),
|
|
decltype((DeclVal<C>().*aMethod)(DeclVal<MediaData*>()), 0));
|
|
|
|
template <typename F>
|
|
static TrueType
|
|
test(F&&, decltype(DeclVal<F>()(DeclVal<MediaData*>()), 0));
|
|
|
|
static FalseType test(...);
|
|
public:
|
|
typedef decltype(test(DeclVal<T>(), 0)) Type;
|
|
};
|
|
|
|
template <typename T>
|
|
struct ArgType1Check : public ArgType1CheckHelper<T>::Type {};
|
|
|
|
/*
|
|
* Type 2: void(MediaData*, TimeStamp)
|
|
* void(RefPtr<MediaData>, TimeStamp)
|
|
* void(MediaData*, TimeStamp&)
|
|
* void(RefPtr<MediaData>, const TimeStamp&&)
|
|
*/
|
|
template <typename T>
|
|
class ArgType2CheckHelper {
|
|
|
|
template<typename C, typename... Ts>
|
|
static TrueType
|
|
test(void(C::*aMethod)(Ts...),
|
|
decltype((DeclVal<C>().*aMethod)(DeclVal<MediaData*>(), DeclVal<TimeStamp>()), 0));
|
|
|
|
template <typename F>
|
|
static TrueType
|
|
test(F&&, decltype(DeclVal<F>()(DeclVal<MediaData*>(), DeclVal<TimeStamp>()), 0));
|
|
|
|
static FalseType test(...);
|
|
public:
|
|
typedef decltype(test(DeclVal<T>(), 0)) Type;
|
|
};
|
|
|
|
template <typename T>
|
|
struct ArgType2Check : public ArgType2CheckHelper<T>::Type {};
|
|
|
|
struct CallbackBase
|
|
{
|
|
virtual ~CallbackBase() {}
|
|
virtual void OnResolved(MediaData*, TimeStamp) = 0;
|
|
virtual void OnRejected(MediaDecoderReader::NotDecodedReason) = 0;
|
|
};
|
|
|
|
template<typename ThisType, typename ResolveMethodType, typename RejectMethodType>
|
|
struct MethodCallback : public CallbackBase
|
|
{
|
|
MethodCallback(ThisType* aThis, ResolveMethodType aResolveMethod, RejectMethodType aRejectMethod)
|
|
: mThis(aThis), mResolveMethod(aResolveMethod), mRejectMethod(aRejectMethod)
|
|
{
|
|
}
|
|
|
|
template<typename F>
|
|
typename EnableIf<ArgType1Check<F>::value, void>::Type
|
|
CallHelper(MediaData* aSample, TimeStamp)
|
|
{
|
|
(mThis->*mResolveMethod)(aSample);
|
|
}
|
|
|
|
template<typename F>
|
|
typename EnableIf<ArgType2Check<F>::value, void>::Type
|
|
CallHelper(MediaData* aSample, TimeStamp aDecodeStartTime)
|
|
{
|
|
(mThis->*mResolveMethod)(aSample, aDecodeStartTime);
|
|
}
|
|
|
|
void OnResolved(MediaData* aSample, TimeStamp aDecodeStartTime) override
|
|
{
|
|
CallHelper<ResolveMethodType>(aSample, aDecodeStartTime);
|
|
}
|
|
|
|
void OnRejected(MediaDecoderReader::NotDecodedReason aReason) override
|
|
{
|
|
(mThis->*mRejectMethod)(aReason);
|
|
}
|
|
|
|
RefPtr<ThisType> mThis;
|
|
ResolveMethodType mResolveMethod;
|
|
RejectMethodType mRejectMethod;
|
|
};
|
|
|
|
template<typename ResolveFunctionType, typename RejectFunctionType>
|
|
struct FunctionCallback : public CallbackBase
|
|
{
|
|
FunctionCallback(ResolveFunctionType&& aResolveFuntion, RejectFunctionType&& aRejectFunction)
|
|
: mResolveFuntion(Move(aResolveFuntion)), mRejectFunction(Move(aRejectFunction))
|
|
{
|
|
}
|
|
|
|
template<typename F>
|
|
typename EnableIf<ArgType1Check<F>::value, void>::Type
|
|
CallHelper(MediaData* aSample, TimeStamp)
|
|
{
|
|
mResolveFuntion(aSample);
|
|
}
|
|
|
|
template<typename F>
|
|
typename EnableIf<ArgType2Check<F>::value, void>::Type
|
|
CallHelper(MediaData* aSample, TimeStamp aDecodeStartTime)
|
|
{
|
|
mResolveFuntion(aSample, aDecodeStartTime);
|
|
}
|
|
|
|
void OnResolved(MediaData* aSample, TimeStamp aDecodeStartTime) override
|
|
{
|
|
CallHelper<ResolveFunctionType>(aSample, aDecodeStartTime);
|
|
}
|
|
|
|
void OnRejected(MediaDecoderReader::NotDecodedReason aReason) override
|
|
{
|
|
mRejectFunction(aReason);
|
|
}
|
|
|
|
ResolveFunctionType mResolveFuntion;
|
|
RejectFunctionType mRejectFunction;
|
|
};
|
|
|
|
public:
|
|
MediaDecoderReaderWrapper(bool aIsRealTime,
|
|
AbstractThread* aOwnerThread,
|
|
MediaDecoderReader* aReader);
|
|
|
|
media::TimeUnit StartTime() const;
|
|
RefPtr<MetadataPromise> ReadMetadata();
|
|
RefPtr<HaveStartTimePromise> AwaitStartTime();
|
|
|
|
template<typename ThisType, typename ResolveMethodType, typename RejectMethodType>
|
|
CallbackID
|
|
SetAudioCallback(ThisType* aThisVal,
|
|
ResolveMethodType aResolveMethod,
|
|
RejectMethodType aRejectMethod)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mRequestAudioDataCB,
|
|
"Please cancel the original callback before setting a new one.");
|
|
|
|
mRequestAudioDataCB.reset(
|
|
new MethodCallback<ThisType, ResolveMethodType, RejectMethodType>(
|
|
aThisVal, aResolveMethod, aRejectMethod));
|
|
|
|
return mAudioCallbackID;
|
|
}
|
|
|
|
template<typename ResolveFunction, typename RejectFunction>
|
|
CallbackID
|
|
SetAudioCallback(ResolveFunction&& aResolveFunction,
|
|
RejectFunction&& aRejectFunction)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mRequestAudioDataCB,
|
|
"Please cancel the original callback before setting a new one.");
|
|
|
|
mRequestAudioDataCB.reset(
|
|
new FunctionCallback<ResolveFunction, RejectFunction>(
|
|
Move(aResolveFunction), Move(aRejectFunction)));
|
|
|
|
return mAudioCallbackID;
|
|
}
|
|
|
|
template<typename ThisType, typename ResolveMethodType, typename RejectMethodType>
|
|
CallbackID
|
|
SetVideoCallback(ThisType* aThisVal,
|
|
ResolveMethodType aResolveMethod,
|
|
RejectMethodType aRejectMethod)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mRequestVideoDataCB,
|
|
"Please cancel the original callback before setting a new one.");
|
|
|
|
mRequestVideoDataCB.reset(
|
|
new MethodCallback<ThisType, ResolveMethodType, RejectMethodType>(
|
|
aThisVal, aResolveMethod, aRejectMethod));
|
|
|
|
return mVideoCallbackID;
|
|
}
|
|
|
|
template<typename ResolveFunction, typename RejectFunction>
|
|
CallbackID
|
|
SetVideoCallback(ResolveFunction&& aResolveFunction,
|
|
RejectFunction&& aRejectFunction)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mRequestVideoDataCB,
|
|
"Please cancel the original callback before setting a new one.");
|
|
|
|
mRequestVideoDataCB.reset(
|
|
new FunctionCallback<ResolveFunction, RejectFunction>(
|
|
Move(aResolveFunction), Move(aRejectFunction)));
|
|
|
|
return mVideoCallbackID;
|
|
}
|
|
|
|
void CancelAudioCallback(CallbackID aID);
|
|
void CancelVideoCallback(CallbackID aID);
|
|
|
|
// NOTE: please set callbacks before requesting audio/video data!
|
|
void RequestAudioData();
|
|
void RequestVideoData(bool aSkipToNextKeyframe, media::TimeUnit aTimeThreshold);
|
|
|
|
bool IsRequestingAudioData() const;
|
|
bool IsRequestingVideoData() const;
|
|
|
|
RefPtr<SeekPromise> Seek(SeekTarget aTarget, media::TimeUnit aEndTime);
|
|
RefPtr<WaitForDataPromise> WaitForData(MediaData::Type aType);
|
|
RefPtr<BufferedUpdatePromise> UpdateBufferedWithPromise();
|
|
RefPtr<ShutdownPromise> Shutdown();
|
|
|
|
void ReleaseMediaResources();
|
|
void SetIdle();
|
|
void ResetDecode(TargetQueues aQueues);
|
|
|
|
nsresult Init() { return mReader->Init(); }
|
|
bool IsWaitForDataSupported() const { return mReader->IsWaitForDataSupported(); }
|
|
bool IsAsync() const { return mReader->IsAsync(); }
|
|
bool UseBufferingHeuristics() const { return mReader->UseBufferingHeuristics(); }
|
|
bool ForceZeroStartTime() const { return mReader->ForceZeroStartTime(); }
|
|
|
|
bool VideoIsHardwareAccelerated() const {
|
|
return mReader->VideoIsHardwareAccelerated();
|
|
}
|
|
TimedMetadataEventSource& TimedMetadataEvent() {
|
|
return mReader->TimedMetadataEvent();
|
|
}
|
|
MediaEventSource<void>& OnMediaNotSeekable() {
|
|
return mReader->OnMediaNotSeekable();
|
|
}
|
|
size_t SizeOfVideoQueueInBytes() const {
|
|
return mReader->SizeOfVideoQueueInBytes();
|
|
}
|
|
size_t SizeOfAudioQueueInBytes() const {
|
|
return mReader->SizeOfAudioQueueInBytes();
|
|
}
|
|
size_t SizeOfAudioQueueInFrames() const {
|
|
return mReader->SizeOfAudioQueueInFrames();
|
|
}
|
|
size_t SizeOfVideoQueueInFrames() const {
|
|
return mReader->SizeOfVideoQueueInFrames();
|
|
}
|
|
void ReadUpdatedMetadata(MediaInfo* aInfo) {
|
|
mReader->ReadUpdatedMetadata(aInfo);
|
|
}
|
|
AbstractCanonical<media::TimeIntervals>* CanonicalBuffered() {
|
|
return mReader->CanonicalBuffered();
|
|
}
|
|
|
|
#ifdef MOZ_EME
|
|
void SetCDMProxy(CDMProxy* aProxy) { mReader->SetCDMProxy(aProxy); }
|
|
#endif
|
|
|
|
private:
|
|
~MediaDecoderReaderWrapper();
|
|
|
|
void OnMetadataRead(MetadataHolder* aMetadata);
|
|
void OnMetadataNotRead() {}
|
|
void OnSampleDecoded(CallbackBase* aCallback, MediaData* aSample,
|
|
TimeStamp aVideoDecodeStartTime);
|
|
void OnNotDecoded(CallbackBase* aCallback,
|
|
MediaDecoderReader::NotDecodedReason aReason);
|
|
|
|
const bool mForceZeroStartTime;
|
|
const RefPtr<AbstractThread> mOwnerThread;
|
|
const RefPtr<MediaDecoderReader> mReader;
|
|
|
|
bool mShutdown = false;
|
|
RefPtr<StartTimeRendezvous> mStartTimeRendezvous;
|
|
|
|
UniquePtr<CallbackBase> mRequestAudioDataCB;
|
|
UniquePtr<CallbackBase> mRequestVideoDataCB;
|
|
MozPromiseRequestHolder<MediaDataPromise> mAudioDataRequest;
|
|
MozPromiseRequestHolder<MediaDataPromise> mVideoDataRequest;
|
|
|
|
/*
|
|
* These callback ids are used to prevent mis-canceling callback.
|
|
*/
|
|
CallbackID mAudioCallbackID;
|
|
CallbackID mVideoCallbackID;
|
|
};
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif // MediaDecoderReaderWrapper_h_
|