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)
415 lines
13 KiB
C++
415 lines
13 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 "mozilla/MozPromise.h"
|
|
#include "MediaDecoderReaderWrapper.h"
|
|
|
|
namespace mozilla {
|
|
|
|
extern LazyLogModule gMediaDecoderLog;
|
|
|
|
#undef LOG
|
|
#define LOG(...) \
|
|
MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
|
|
|
|
// StartTimeRendezvous is a helper class that quarantines the first sample
|
|
// until it gets a sample from both channels, such that we can be guaranteed
|
|
// to know the start time by the time On{Audio,Video}Decoded is called on MDSM.
|
|
class StartTimeRendezvous {
|
|
typedef MediaDecoderReader::MediaDataPromise MediaDataPromise;
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(StartTimeRendezvous);
|
|
|
|
public:
|
|
StartTimeRendezvous(AbstractThread* aOwnerThread,
|
|
bool aHasAudio,
|
|
bool aHasVideo,
|
|
bool aForceZeroStartTime)
|
|
: mOwnerThread(aOwnerThread)
|
|
{
|
|
if (aForceZeroStartTime) {
|
|
mAudioStartTime.emplace(0);
|
|
mVideoStartTime.emplace(0);
|
|
return;
|
|
}
|
|
if (!aHasAudio) {
|
|
mAudioStartTime.emplace(INT64_MAX);
|
|
}
|
|
if (!aHasVideo) {
|
|
mVideoStartTime.emplace(INT64_MAX);
|
|
}
|
|
}
|
|
|
|
void Destroy()
|
|
{
|
|
mAudioStartTime = Some(mAudioStartTime.refOr(INT64_MAX));
|
|
mVideoStartTime = Some(mVideoStartTime.refOr(INT64_MAX));
|
|
mHaveStartTimePromise.RejectIfExists(false, __func__);
|
|
}
|
|
|
|
RefPtr<HaveStartTimePromise> AwaitStartTime()
|
|
{
|
|
if (HaveStartTime()) {
|
|
return HaveStartTimePromise::CreateAndResolve(true, __func__);
|
|
}
|
|
return mHaveStartTimePromise.Ensure(__func__);
|
|
}
|
|
|
|
template<MediaData::Type SampleType>
|
|
RefPtr<MediaDataPromise>
|
|
ProcessFirstSample(MediaData* aData)
|
|
{
|
|
typedef typename MediaDataPromise::Private PromisePrivate;
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
|
|
MaybeSetChannelStartTime<SampleType>(aData->mTime);
|
|
|
|
RefPtr<PromisePrivate> p = new PromisePrivate(__func__);
|
|
RefPtr<MediaData> data = aData;
|
|
RefPtr<StartTimeRendezvous> self = this;
|
|
AwaitStartTime()->Then(
|
|
mOwnerThread, __func__,
|
|
[p, data, self] () {
|
|
MOZ_ASSERT(self->mOwnerThread->IsCurrentThreadIn());
|
|
p->Resolve(data, __func__);
|
|
},
|
|
[p] () {
|
|
p->Reject(MediaDecoderReader::CANCELED, __func__);
|
|
});
|
|
|
|
return p.forget();
|
|
}
|
|
|
|
template<MediaData::Type SampleType>
|
|
void FirstSampleRejected(MediaDecoderReader::NotDecodedReason aReason)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
if (aReason == MediaDecoderReader::DECODE_ERROR) {
|
|
mHaveStartTimePromise.RejectIfExists(false, __func__);
|
|
} else if (aReason == MediaDecoderReader::END_OF_STREAM) {
|
|
LOG("StartTimeRendezvous=%p SampleType(%d) Has no samples.",
|
|
this, SampleType);
|
|
MaybeSetChannelStartTime<SampleType>(INT64_MAX);
|
|
}
|
|
}
|
|
|
|
bool HaveStartTime() const
|
|
{
|
|
return mAudioStartTime.isSome() && mVideoStartTime.isSome();
|
|
}
|
|
|
|
int64_t StartTime() const
|
|
{
|
|
int64_t time = std::min(mAudioStartTime.ref(), mVideoStartTime.ref());
|
|
return time == INT64_MAX ? 0 : time;
|
|
}
|
|
|
|
private:
|
|
~StartTimeRendezvous() {}
|
|
|
|
template<MediaData::Type SampleType>
|
|
void MaybeSetChannelStartTime(int64_t aStartTime)
|
|
{
|
|
if (ChannelStartTime(SampleType).isSome()) {
|
|
// If we're initialized with aForceZeroStartTime=true, the channel start
|
|
// times are already set.
|
|
return;
|
|
}
|
|
|
|
LOG("StartTimeRendezvous=%p Setting SampleType(%d) start time to %lld",
|
|
this, SampleType, aStartTime);
|
|
|
|
ChannelStartTime(SampleType).emplace(aStartTime);
|
|
if (HaveStartTime()) {
|
|
mHaveStartTimePromise.ResolveIfExists(true, __func__);
|
|
}
|
|
}
|
|
|
|
Maybe<int64_t>& ChannelStartTime(MediaData::Type aType)
|
|
{
|
|
return aType == MediaData::AUDIO_DATA ? mAudioStartTime : mVideoStartTime;
|
|
}
|
|
|
|
MozPromiseHolder<HaveStartTimePromise> mHaveStartTimePromise;
|
|
RefPtr<AbstractThread> mOwnerThread;
|
|
Maybe<int64_t> mAudioStartTime;
|
|
Maybe<int64_t> mVideoStartTime;
|
|
};
|
|
|
|
MediaDecoderReaderWrapper::MediaDecoderReaderWrapper(bool aIsRealTime,
|
|
AbstractThread* aOwnerThread,
|
|
MediaDecoderReader* aReader)
|
|
: mForceZeroStartTime(aIsRealTime || aReader->ForceZeroStartTime())
|
|
, mOwnerThread(aOwnerThread)
|
|
, mReader(aReader)
|
|
, mAudioCallbackID("AudioCallbackID")
|
|
, mVideoCallbackID("VideoCallbackID")
|
|
{}
|
|
|
|
MediaDecoderReaderWrapper::~MediaDecoderReaderWrapper()
|
|
{}
|
|
|
|
media::TimeUnit
|
|
MediaDecoderReaderWrapper::StartTime() const
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
return media::TimeUnit::FromMicroseconds(mStartTimeRendezvous->StartTime());
|
|
}
|
|
|
|
RefPtr<MediaDecoderReaderWrapper::MetadataPromise>
|
|
MediaDecoderReaderWrapper::ReadMetadata()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
return InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::AsyncReadMetadata)
|
|
->Then(mOwnerThread, __func__, this,
|
|
&MediaDecoderReaderWrapper::OnMetadataRead,
|
|
&MediaDecoderReaderWrapper::OnMetadataNotRead)
|
|
->CompletionPromise();
|
|
}
|
|
|
|
RefPtr<HaveStartTimePromise>
|
|
MediaDecoderReaderWrapper::AwaitStartTime()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
return mStartTimeRendezvous->AwaitStartTime();
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::CancelAudioCallback(CallbackID aID)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(aID == mAudioCallbackID);
|
|
++mAudioCallbackID;
|
|
mRequestAudioDataCB = nullptr;
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::CancelVideoCallback(CallbackID aID)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(aID == mVideoCallbackID);
|
|
++mVideoCallbackID;
|
|
mRequestVideoDataCB = nullptr;
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::RequestAudioData()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
MOZ_ASSERT(mRequestAudioDataCB, "Request audio data without callback!");
|
|
|
|
auto p = InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::RequestAudioData);
|
|
|
|
if (!mStartTimeRendezvous->HaveStartTime()) {
|
|
p = p->Then(mOwnerThread, __func__, mStartTimeRendezvous.get(),
|
|
&StartTimeRendezvous::ProcessFirstSample<MediaData::AUDIO_DATA>,
|
|
&StartTimeRendezvous::FirstSampleRejected<MediaData::AUDIO_DATA>)
|
|
->CompletionPromise();
|
|
}
|
|
|
|
RefPtr<MediaDecoderReaderWrapper> self = this;
|
|
mAudioDataRequest.Begin(p->Then(mOwnerThread, __func__,
|
|
[self] (MediaData* aAudioSample) {
|
|
MOZ_ASSERT(self->mRequestAudioDataCB);
|
|
self->mAudioDataRequest.Complete();
|
|
self->OnSampleDecoded(self->mRequestAudioDataCB.get(), aAudioSample, TimeStamp());
|
|
},
|
|
[self] (MediaDecoderReader::NotDecodedReason aReason) {
|
|
MOZ_ASSERT(self->mRequestAudioDataCB);
|
|
self->mAudioDataRequest.Complete();
|
|
self->OnNotDecoded(self->mRequestAudioDataCB.get(), aReason);
|
|
}));
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::RequestVideoData(bool aSkipToNextKeyframe,
|
|
media::TimeUnit aTimeThreshold)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
MOZ_ASSERT(mRequestVideoDataCB, "Request video data without callback!");
|
|
|
|
// Time the video decode and send this value back to callbacks who accept
|
|
// a TimeStamp as its second parameter.
|
|
TimeStamp videoDecodeStartTime = TimeStamp::Now();
|
|
|
|
if (aTimeThreshold.ToMicroseconds() > 0 &&
|
|
mStartTimeRendezvous->HaveStartTime()) {
|
|
aTimeThreshold += StartTime();
|
|
}
|
|
|
|
auto p = InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::RequestVideoData,
|
|
aSkipToNextKeyframe, aTimeThreshold.ToMicroseconds());
|
|
|
|
if (!mStartTimeRendezvous->HaveStartTime()) {
|
|
p = p->Then(mOwnerThread, __func__, mStartTimeRendezvous.get(),
|
|
&StartTimeRendezvous::ProcessFirstSample<MediaData::VIDEO_DATA>,
|
|
&StartTimeRendezvous::FirstSampleRejected<MediaData::VIDEO_DATA>)
|
|
->CompletionPromise();
|
|
}
|
|
|
|
RefPtr<MediaDecoderReaderWrapper> self = this;
|
|
mVideoDataRequest.Begin(p->Then(mOwnerThread, __func__,
|
|
[self, videoDecodeStartTime] (MediaData* aVideoSample) {
|
|
MOZ_ASSERT(self->mRequestVideoDataCB);
|
|
self->mVideoDataRequest.Complete();
|
|
self->OnSampleDecoded(self->mRequestVideoDataCB.get(), aVideoSample, videoDecodeStartTime);
|
|
},
|
|
[self] (MediaDecoderReader::NotDecodedReason aReason) {
|
|
MOZ_ASSERT(self->mRequestVideoDataCB);
|
|
self->mVideoDataRequest.Complete();
|
|
self->OnNotDecoded(self->mRequestVideoDataCB.get(), aReason);
|
|
}));
|
|
}
|
|
|
|
bool
|
|
MediaDecoderReaderWrapper::IsRequestingAudioData() const
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
return mAudioDataRequest.Exists();
|
|
}
|
|
|
|
bool
|
|
MediaDecoderReaderWrapper::IsRequestingVidoeData() const
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
return mVideoDataRequest.Exists();
|
|
}
|
|
|
|
RefPtr<MediaDecoderReader::SeekPromise>
|
|
MediaDecoderReaderWrapper::Seek(SeekTarget aTarget, media::TimeUnit aEndTime)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
aTarget.SetTime(aTarget.GetTime() + StartTime());
|
|
return InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::Seek, aTarget,
|
|
aEndTime.ToMicroseconds());
|
|
}
|
|
|
|
RefPtr<MediaDecoderReaderWrapper::WaitForDataPromise>
|
|
MediaDecoderReaderWrapper::WaitForData(MediaData::Type aType)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
return InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::WaitForData, aType);
|
|
}
|
|
|
|
RefPtr<MediaDecoderReaderWrapper::BufferedUpdatePromise>
|
|
MediaDecoderReaderWrapper::UpdateBufferedWithPromise()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
return InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::UpdateBufferedWithPromise);
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::ReleaseMediaResources()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
nsCOMPtr<nsIRunnable> r =
|
|
NewRunnableMethod(mReader, &MediaDecoderReader::ReleaseMediaResources);
|
|
mReader->OwnerThread()->Dispatch(r.forget());
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::SetIdle()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
nsCOMPtr<nsIRunnable> r =
|
|
NewRunnableMethod(mReader, &MediaDecoderReader::SetIdle);
|
|
mReader->OwnerThread()->Dispatch(r.forget());
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::ResetDecode(TargetQueues aQueues)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
|
|
mAudioDataRequest.DisconnectIfExists();
|
|
mVideoDataRequest.DisconnectIfExists();
|
|
|
|
nsCOMPtr<nsIRunnable> r =
|
|
NewRunnableMethod<TargetQueues>(mReader,
|
|
&MediaDecoderReader::ResetDecode,
|
|
aQueues);
|
|
mReader->OwnerThread()->Dispatch(r.forget());
|
|
}
|
|
|
|
RefPtr<ShutdownPromise>
|
|
MediaDecoderReaderWrapper::Shutdown()
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mRequestAudioDataCB);
|
|
MOZ_ASSERT(!mRequestVideoDataCB);
|
|
MOZ_ASSERT(!mAudioDataRequest.Exists());
|
|
MOZ_ASSERT(!mVideoDataRequest.Exists());
|
|
|
|
mShutdown = true;
|
|
if (mStartTimeRendezvous) {
|
|
mStartTimeRendezvous->Destroy();
|
|
mStartTimeRendezvous = nullptr;
|
|
}
|
|
return InvokeAsync(mReader->OwnerThread(), mReader.get(), __func__,
|
|
&MediaDecoderReader::Shutdown);
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::OnMetadataRead(MetadataHolder* aMetadata)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
if (mShutdown) {
|
|
return;
|
|
}
|
|
// Set up the start time rendezvous if it doesn't already exist (which is
|
|
// generally the case, unless we're coming out of dormant mode).
|
|
if (!mStartTimeRendezvous) {
|
|
mStartTimeRendezvous = new StartTimeRendezvous(
|
|
mOwnerThread, aMetadata->mInfo.HasAudio(),
|
|
aMetadata->mInfo.HasVideo(), mForceZeroStartTime);
|
|
|
|
RefPtr<MediaDecoderReaderWrapper> self = this;
|
|
mStartTimeRendezvous->AwaitStartTime()->Then(
|
|
mOwnerThread, __func__,
|
|
[self] () {
|
|
NS_ENSURE_TRUE_VOID(!self->mShutdown);
|
|
self->mReader->DispatchSetStartTime(self->StartTime().ToMicroseconds());
|
|
},
|
|
[] () {
|
|
NS_WARNING("Setting start time on reader failed");
|
|
});
|
|
}
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::OnSampleDecoded(CallbackBase* aCallback,
|
|
MediaData* aSample,
|
|
TimeStamp aDecodeStartTime)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
|
|
aSample->AdjustForStartTime(StartTime().ToMicroseconds());
|
|
aCallback->OnResolved(aSample, aDecodeStartTime);
|
|
}
|
|
|
|
void
|
|
MediaDecoderReaderWrapper::OnNotDecoded(CallbackBase* aCallback,
|
|
MediaDecoderReader::NotDecodedReason aReason)
|
|
{
|
|
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
|
|
MOZ_ASSERT(!mShutdown);
|
|
|
|
aCallback->OnRejected(aReason);
|
|
}
|
|
|
|
} // namespace mozilla
|