Skip to content

Commit 78d889f

Browse files
author
Norisz Fay
committed
Revert "Bug 1993981 - Rename MediaTrackGraphImpl::LifecycleStateRef() -> LifecycleState() and return state by value. r=karlt" for causing bustage @ AbstractThread.h and Gtest failures @ StateWatching.h
This reverts commit 86b579e. Revert "Bug 1993981 - Unit test graph shutdown message ordering. r=karlt" This reverts commit 1a7e168. Revert "Bug 1993981 - Introduce an atomicity policy for tail dispatch. r=karlt,xpcom-reviewers,nika,webrtc-reviewers,bwc,media-playback-reviewers" This reverts commit 3eba0a2. Revert "Bug 1993981 - Unit test message atomicity. r=karlt" This reverts commit edde7ff. Revert "Bug 1993981 - Unit test event ordering between the graph and main thread. r=karlt" This reverts commit 8641979. Revert "Bug 1993981 - To MockProcessedMediaTrack add mocks for {Add|Remove}ListenerImpl. r=karlt" This reverts commit 165e177. Revert "Bug 1993981 - In MediaTrackGraphImpl natively support AudioWorklet's message passing. r=karlt" This reverts commit 7365f2d. Revert "Bug 1993981 - Implement AbstractThread for MediaTrackGraphImpl. r=karlt" This reverts commit 7cdca42. Revert "Bug 1993981 - Rename MediaTrackGraphImpl::Dispatch to DispatchToMainThread to avoid naming conflicts with nsISerialEventTarget. r=karlt" This reverts commit 186f4c8. Revert "Bug 1993981 - Allow canceling cancelable and discardable tail-dispatched runnables. r=xpcom-reviewers,nika" This reverts commit 5c0ae53. Revert "Bug 1993981 - Implement nsIDirectTaskDispatcher for MediaTrackGraphImpl. r=karlt" This reverts commit 05da491. Revert "Bug 1993981 - Store ControlMessages as runnables. r=karlt" This reverts commit 68a2b11.
1 parent b9b93c7 commit 78d889f

29 files changed

Lines changed: 496 additions & 1560 deletions

‎dom/media/MediaDecoderStateMachineBase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ MediaDecoderStateMachineBase::MediaDecoderStateMachineBase(
3636
mVideoFrameContainer(aDecoder->GetVideoFrameContainer()),
3737
mTaskQueue(TaskQueue::Create(GetMediaThreadPool(MediaThreadType::MDSM),
3838
"MDSM::mTaskQueue",
39-
TailDispatchPolicy::ConsistentOrdering)),
39+
/* aSupportsTailDispatch = */ true)),
4040
mReader(new ReaderProxy(mTaskQueue, aReader)),
4141
mPlaybackRate(1.0),
4242
INIT_MIRROR(mBuffered, media::TimeIntervals()),

‎dom/media/MediaFormatReader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ MediaFormatReader::MediaFormatReader(MediaFormatReaderInit& aInit,
901901
: mTaskQueue(
902902
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
903903
"MediaFormatReader::mTaskQueue",
904-
TailDispatchPolicy::ConsistentOrdering)),
904+
/* aSupportsTailDispatch = */ true)),
905905
mAudio(this, MediaData::Type::AUDIO_DATA,
906906
StaticPrefs::media_audio_max_decode_error()),
907907
mVideo(this, MediaData::Type::VIDEO_DATA,

‎dom/media/MediaManager.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2544,14 +2544,15 @@ MediaManager* MediaManager::Get() {
25442544
timesCreated++;
25452545
MOZ_RELEASE_ASSERT(timesCreated == 1);
25462546

2547+
constexpr bool kSupportsTailDispatch = false;
25472548
RefPtr<TaskQueue> mediaThread =
25482549
#ifdef MOZ_WEBRTC
25492550
CreateWebrtcTaskQueueWrapper(
25502551
GetMediaThreadPool(MediaThreadType::SUPERVISOR), "MediaManager"_ns,
2551-
TailDispatchPolicy::NoTailDispatch);
2552+
kSupportsTailDispatch);
25522553
#else
25532554
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
2554-
"MediaManager", TailDispatchPolicy::NoTailDispatch);
2555+
"MediaManager", kSupportsTailDispatch);
25552556
#endif
25562557
LOG("New Media thread for gum");
25572558

0 commit comments

Comments
 (0)