mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
b564bd67d3
- Use CompositorWidgetProxy for dispatching vsync to the compositor. (bug 1269037 part 1, r=mchang) (c8b7a4240c) - Remove unused null widget checks. (bug 1269037 part 2, r=mchang) (4f4cc9952b) - Bug 1269422: Wrap Gonk widget in |CompositorWidgetProxyWrapper|. r=dvander (4513035cbf) - Remove nsBaseWidget::NewCompositorBridgeParent. (bug 1272472 part 1, r=kats) (ca813c1f2b) - Use IPDL to schedule composites on GTK. (bug 1272472 part 2, r=nical) (7402cf834e) - Use IPC to schedule composites on Windows. (bug 1272472 part 3, r=jimm) (e5d7281dd7) - Don't use nsIWidget to check APZ in LayerManagerComposite. (bug 1269653 part 1, r=kats) (79a1644111) - Restrict SetDispAcquireFence's nsIWidget access to Gonk. (bug 1269653 part 2, r=kats) (72110b7bc7) - Bug 1264764 - Move PTexture under PCompositorBridge r=nical,dvander (17e6ec7fc1) - Move CompositorThreadHolder into its own file. (bug 1273017 part 1, r=mattwoodrow) (464ede8be1) - Move CompositorBridgeParent::CompositorLoop to CompositorThreadHolder. (bug 1273017 part 2, r=mattwoodrow) (85708f3cde) - Bug 1268313: Part 1 - Be explicit about which NewRunnableMethod callers want to be able to cancel. r=froydnj (faa07aa139) - Bug 1268313: Part 2 - Replace some NewRunnableMethods with NS_NewNonOwningRunnableMethod. r=froydnj (010c43d000) - Bug 1268313: Part 3 - Replace some NewCancelableRunnableMethod with NS_NewNonOwningCancelableRunnableMethod. r=froydnj (55018ef234) - Bug 1268313: Part 4 - Replace NewCancelableRunnableMethod with NS_NewCancelableRunnableMethod. r=froydnj (c22711b35d) - Bug 1268313: Part 5 - Make NS_NewRunnableMethod able to call const functions. r=froydnj (b0f60963a3) - Bug 1268313: Part 6 - Replace NewRunnableMethod with NS_NewRunnableMethod. r=froydnj (18d40def2c) - Bug 1260950 - Set mInitialSizeFound to true when the initial size id found. r=jesup, r=pehrsons a=kwierso (5d6abe57e0) - Bug 1237176 - Notify synth start if we get a finished event without a blocking-changed event. r=roc (c1aebe903a) - Bug 911546, use a runnable so that popups don't rollup during a grab, r=karlt (a06bd44e6c) - Bug 1237617 - Call nsWindow::ForcePresent during going active r=bas.schouten (066cad8f89) - Bug 1268313: Part 7 - Move NS_NewRunnableMethod and friends to mozilla::NewRunnableMethod. r=froydnj (8b4bf34961) - Bug 1266595: Followup to fix IPDL tests. r=billm (216f2dcff5) - Bug 1268313: Fix up IPDL tests. r=billm (228348d642) - Add WinCompositorWidgetProxy. (bug 1265975 part 1, r=jimm) (bfafe7a8e2) - Implement WinCompositorWidgetProxy::GetClientSize. (bug 1265975 part 2, r=jimm) (a8710a3259) - Move the WM_SETTEXT present lock to CompositorWidgetProxy. (bug 1265975 part 3, r=jimm) (297ce28c8a) - Move transparency handling to WinCompositorWigetProxy. (bug 1265975 part 4, r=jimm) (46ba0c6d01) - Remove Windows-specific compositor calls to nsIWidget. (bug 1265975 part 5, r=jimm) (3ef157c160) - Remove plugin-related CompositorBridgeParent use of nsIWidget. (bug 1265975 part 6, r=jimm) (6d80cdd6fd) - Hide top-level CompositorBridgeParents behind a new API. (bug 1272472 part 4, r=mattwoodrow,kats,gwagner) (228c0efdb7) - Bug 1253424 - part 1 - add a already_AddRefed nsTransactionStack::Push overload; r=erahm (7059e20914) - Bug 1253424 - part 2 - add nsTransactionStack::IsEmpty; r=erahm (7e9764a146) - Bug 1254618 - modify nsTransactionStack to use nsDeque rather than std::deque; r=ehsan (5e47ea431e) - Bug 1136857 - Make DOMStorageCache::mLoaded flag atomic to prevent potential races, r=nfroyd (39aaea1de3) - Bug 1265408 - Add webidl for IIRFilterNode; r=smaug (040ce9aa43) - Bug 1265408 - Implement IIRFilterNode; r=padenot (6bf569a412) - Bug 1265408 - Import IIRFilter from blink; r=padenot (71b28c0ad2) - Bug 1265408 - Use IIRFilter from blink; r=padenot (5d058d8568) - Bug 1265408 - Add buffersAreZero to IIRFilter; r=karlt (45edba3e13) - Bug 1265408 - Avoid subnormals in IIRFilter; r=karlt (0e1ae93f0b) - Bug 1265408 - Add LogToDeveloperConsole to WebAudioUtils; r=padenot (88d5f0222a) - Bug 1268984 - Store GMPStorage on GMPServiceParent so that it persists inside the same PB session. r=gerald (17d4d0abaf) - Bug 1267905 - Replace uses of ScopedCERTCertList with UniqueCERTCertList. r=keeler (783bf11b2a) - Bug 1270005 - Replace uses of ScopedPK11SlotInfo with UniquePK11SlotInfo in PSM. r=keeler (ea9a4011aa) - Bug 1271501 - Remove unnecessary uses of reinterpret_cast in PSM. r=keeler (6be40f0a85) - Bug 1271501 - Downgrade unnecessarily strong reinterpret_casts in PSM. r=keeler (95245f00ce) - Bug 1082346 - 01. Convert PKCS12 password endian using copyAndSwapToBigEndian. r=keeler (9cc58fc550) - Bug 1082346 - 02. Test case. r=keeler r=Cykesiopka (7fb0e8abc4) - Bug 160122 - Stop using PR_smprintf in PSM. r=keeler (1e5b68819c) - Bug 1271501 - Use mozilla::BitwiseCast instead of reinterpret_cast in PSM. r=keeler (894966a2ef) - Bug 1273855: TraceLogger - Include PID in the log names in order to support browser with e10s, r=bbouvier (8cf2233db3) - Bug 1274189. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya. (4511b3d3f7) - Bug 1274189. Part 2 - remove use of FlushableTaskQueue::Flush(). r=jya. (77e745fdd1) - Bug 1274189. Part 3 - remove use of FlushableTaskQueue. r=jya (aac61dcd02) - Bug 1269963. Part 1 - Add a SyncRunnable::DispatchToThread() overload for AbstractThread. r=bobbyholley. (839752aff4) - Bug 1269672 - part1 : revert sampling rate changing of the bug1235612. (9015782e13) - Bug 1270698 - check if we need to enter buffering periodically to ensure we start buffering when running out of decoded audio/video data. r=cpearce. (16734549b7) - Bug 1271581 - use newCurrentTime, instead of GetMediaTime() to decide the nextState; r=jwwang (9c5075eada) - Bug 1224973 - Part 1: Remove MediaDecoderOwner->IsHidden(). r=cpearce,jwwang (4fde3ede5a) - Bug 1224973 - Part 2: Set MediaDecoder visibility via NotifyOwnerActivityChanged. r=cpearce,jwwang (be917202eb) - Bug 1224973 - Part 3: Plumb element visibility into MDSM. r=jya,jwwang (9ec83fa243) - Bug 1224973 - Part 4: Pref media.suspend-bkgnd-video.enabled. r=cpearce,jwwang (43413a025f) - Bug 1269408: P1. Retry InternalSeek if previous attempt failed once more data is available. r=gerald (05db58dc7c) - crude fix (0097068989) - Bug 1269408: P2. Update mochitest. r=gerald (464b4c0724) - Bug 1269408: P3. Ensure a new seek request will cancel the previous internal seek. r=gerald (6ed4b8dc95) - Bug 1269408: P4. Ensure the decoders are flushed prior performing an internal seek. r=gerald (074234067b) - Bug 1269408: P5. Only drop the seek target if it's exactly the seek target. r=gerald (88701eb05a) - Bug 1269408: P6. Add debugging information, useful when a mochitest timeout. r=gerald (ef0270ab0d) - Bug 1269408: P7. Start skip to next keyframe logic when resume point is behind current time. r=gerald (bd40ebf3bc) - Bug 1269408: P8. Add debugging log. r=gerald (e6dbd1f0a6) - Bug 1269408: P9. Move handling logic of skip to next keyframe to its own function. r=gerald (3c8039e417) - Bug 1269408: P10. Reject promise early if in error state. r=me (8af54c574e) - Bug 1224973 - Part 5: Implement suspend decoding for background video. r=cpearce,jwwang,jya (22081521e3) - Bug 1242874 - part1 : create suspened types. r=baku (d3ac9548e5) - Bug 1242874 - part2 : window's suspend attribute. r=baku, r=ehsan (1fd9dc2647) - remove allowscirpted (39ab523036) - Bug 1242874 - part3 : implement different suspended methods. r=baku, r=jwwang (25d1f27a03) - Bug 1242874 - part4 : wrap the volume/mute/suspend for notifyStartedPlaying. r=baku (b8ba3238c2) - bug 1242874 - part5 : add test. r=baku, r=ehsan (f840139b5a) - Bug 1235612 - Part 1: Implement notify media-playback. r=baku (b5ec29da20) - Bug 1235612 - Part 2: Notify audible state in NotifyStartedPlaying. r=baku (dc38583a62) - Bug 1235612 - Part 3: Implement the logic of audible state notification for agent owners. r=baku (f65b3952fa) - Bug 1235612 - Part 4: Modify check audible method. r=jwwang (73457e39eb) - Bug 1269672 - part2 : move audible data checking from MDSM to DecodedAudioDataSink. (d2c3b6874c) - Bug 1269936 - Introduce and call a runtime-wide servo initialization hook. r=heycam (d4d505d4c2) - Bug 1263778 - Rename a bunch of low-level [[Prototype]] access methods to make their interactions with statically-known and dynamically-computed [[Prototype]]s clearer. r=efaust (66bbe8e7db) - Bug 888969 - Permit a cyclic [[Prototype]] chain to be created through a Location object. r=bz, r=efaust (3e3b9cbb16) - re-apply Bug 1054906 - Implement ES6 Symbol.hasInstance 2/2; r=jandem (8d5c7573ff) - Bug 1054906 - Implement ES6 Symbol.hasInstance 1/2; r=evilpie,bz (a836904e5d) - fix misspatch (54a5f2d708) - Bug 1270349 part 1. Add IDL parser support for [LegacyUnenumerableNamedProperties]. r=peterv (8c836bc74a) - Bug 1270349 part 2. Add [LegacyUnenumerableNamedProperties] to the interfaces that specify it in DOM and HTML. r=peterv (25d3cc1377) - Bug 1270349 part 3. Add a way to ask an interface descriptor for a proxy whether its named props should be enumerable. r=peterv (0a9f804867) - Bug 1270349 part 4. Use LegacyUnenumerableNamedProperties instead of NameIsEnumerable() calls to determine whether named props on DOM proxies should be enumerable. r=peterv (82f5158963) - Bug 1270349 part 5. Use LegacyUnenumerableNamedProperties instead of passing flags to GetSupportedNames to determine whether named props on DOM proxies should be reflected in ownPropertyKeys. r=peterv (3984176834) - Bug 1270349 followup to address a review comment. r=peterv (b49f4c5335)
385 lines
10 KiB
C++
385 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());
|
|
|
|
if (mDecoder && mDecoder->DataArrivedEvent()) {
|
|
mDataArrivedListener = mDecoder->DataArrivedEvent()->Connect(
|
|
mTaskQueue, this, &MediaDecoderReader::NotifyDataArrived);
|
|
}
|
|
|
|
// Dispatch initialization that needs to happen on that task queue.
|
|
mTaskQueue->Dispatch(NewRunnableMethod(this, &MediaDecoderReader::InitializationTask));
|
|
}
|
|
|
|
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);
|
|
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(TargetQueues aQueues /*= AUDIO_VIDEO*/)
|
|
{
|
|
VideoQueue().Reset();
|
|
mVideoDiscontinuity = true;
|
|
mBaseVideoPromise.RejectIfExists(CANCELED, __func__);
|
|
|
|
if (aQueues == AUDIO_VIDEO) {
|
|
AudioQueue().Reset();
|
|
mAudioDiscontinuity = true;
|
|
mBaseAudioPromise.RejectIfExists(CANCELED, __func__);
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::MediaDataPromise>
|
|
MediaDecoderReader::DecodeToFirstVideoData()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
typedef MediaDecoderReader::MediaDataPromise 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();
|
|
}
|
|
|
|
void
|
|
MediaDecoderReader::VisibilityChanged()
|
|
{}
|
|
|
|
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));
|
|
metadata->mInfo.AssertValid();
|
|
|
|
// 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 Runnable
|
|
{
|
|
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 Runnable
|
|
{
|
|
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::MediaDataPromise>
|
|
MediaDecoderReader::RequestVideoData(bool aSkipToNextKeyframe,
|
|
int64_t aTimeThreshold)
|
|
{
|
|
RefPtr<MediaDataPromise> 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::MediaDataPromise>
|
|
MediaDecoderReader::RequestAudioData()
|
|
{
|
|
RefPtr<MediaDataPromise> 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;
|
|
}
|
|
|
|
RefPtr<ShutdownPromise>
|
|
MediaDecoderReader::Shutdown()
|
|
{
|
|
MOZ_ASSERT(OnTaskQueue());
|
|
mShutdown = true;
|
|
|
|
mBaseAudioPromise.RejectIfExists(END_OF_STREAM, __func__);
|
|
mBaseVideoPromise.RejectIfExists(END_OF_STREAM, __func__);
|
|
|
|
mDataArrivedListener.DisconnectIfExists();
|
|
|
|
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
|