Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1144519 - Rename MediaDecoder::OnDecodeThread to MediaDecoder::OnDecodeTaskQueue. r=jya

Browse Source
This commit is contained in:
Bobby Holley 2015-03-17 15:33:24 -07:00
parent 3c6cda710d
commit 70685709f1
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/AbstractMediaDecoder.h
View File

@ -56,7 +56,7 @@ public:
virtual bool OnStateMachineTaskQueue() const = 0;
virtual bool OnDecodeThread() const = 0;
virtual bool OnDecodeTaskQueue() const = 0;
// Get the current MediaResource being used. Its URI will be returned
// by currentSrc. Returns what was passed to Load(), if Load() has been called.

10
dom/media/MediaDecoder.cpp
View File

@ -830,7 +830,7 @@ void MediaDecoder::QueueMetadata(int64_t aPublishTime,
nsAutoPtr<MediaInfo> aInfo,
nsAutoPtr<MetadataTags> aTags)
{
NS_ASSERTION(OnDecodeThread(), "Should be on decode thread.");
MOZ_ASSERT(OnDecodeTaskQueue());
GetReentrantMonitor().AssertCurrentThreadIn();
mDecoderStateMachine->QueueMetadata(aPublishTime, aInfo, aTags);
}
@ -1093,7 +1093,7 @@ MediaDecoder::GetStatistics()
double MediaDecoder::ComputePlaybackRate(bool* aReliable)
{
GetReentrantMonitor().AssertCurrentThreadIn();
MOZ_ASSERT(NS_IsMainThread() || OnStateMachineTaskQueue() || OnDecodeThread());
MOZ_ASSERT(NS_IsMainThread() || OnStateMachineTaskQueue() || OnDecodeTaskQueue());
int64_t length = mResource ? mResource->GetLength() : -1;
if (mDuration >= 0 && length >= 0) {
@ -1506,7 +1506,7 @@ void MediaDecoder::Resume(bool aForceBuffering)
void MediaDecoder::StopProgressUpdates()
{
MOZ_ASSERT(OnStateMachineTaskQueue() || OnDecodeThread());
MOZ_ASSERT(OnStateMachineTaskQueue() || OnDecodeTaskQueue());
GetReentrantMonitor().AssertCurrentThreadIn();
mIgnoreProgressData = true;
if (mResource) {
@ -1516,7 +1516,7 @@ void MediaDecoder::StopProgressUpdates()
void MediaDecoder::StartProgressUpdates()
{
MOZ_ASSERT(OnStateMachineTaskQueue() || OnDecodeThread());
MOZ_ASSERT(OnStateMachineTaskQueue() || OnDecodeTaskQueue());
GetReentrantMonitor().AssertCurrentThreadIn();
mIgnoreProgressData = false;
if (mResource) {
@ -1576,7 +1576,7 @@ void MediaDecoder::SetPreservesPitch(bool aPreservesPitch)
}
}
bool MediaDecoder::OnDecodeThread() const {
bool MediaDecoder::OnDecodeTaskQueue() const {
NS_WARN_IF_FALSE(mDecoderStateMachine, "mDecoderStateMachine is null");
return mDecoderStateMachine ? mDecoderStateMachine->OnDecodeTaskQueue() : false;
}

2
dom/media/MediaDecoder.h
View File

@ -670,7 +670,7 @@ public:
bool OnStateMachineTaskQueue() const override;
bool OnDecodeThread() const override;
bool OnDecodeTaskQueue() const override;
// Returns the monitor for other threads to synchronise access to
// state.

4
dom/media/mediasource/SourceBufferDecoder.cpp
View File

@ -162,13 +162,13 @@ SourceBufferDecoder::OnStateMachineTaskQueue() const
}
bool
SourceBufferDecoder::OnDecodeThread() const
SourceBufferDecoder::OnDecodeTaskQueue() const
{
// During initialization we run on our TrackBuffer's task queue.
if (mTaskQueue) {
return mTaskQueue->IsCurrentThreadIn();
}
return mParentDecoder->OnDecodeThread();
return mParentDecoder->OnDecodeTaskQueue();
}
SourceBufferResource*

4
dom/media/mediasource/SourceBufferDecoder.h
View File

@ -40,7 +40,7 @@ public:
virtual bool IsMediaSeekable() final override;
virtual bool IsShutdown() const final override;
virtual bool IsTransportSeekable() final override;
virtual bool OnDecodeThread() const final override;
virtual bool OnDecodeTaskQueue() const final override;
virtual bool OnStateMachineTaskQueue() const final override;
virtual int64_t GetMediaDuration() final override;
virtual layers::ImageContainer* GetImageContainer() final override;
@ -114,7 +114,7 @@ public:
virtual CDMProxy* GetCDMProxy() override
{
MOZ_ASSERT(OnDecodeThread() || NS_IsMainThread());
MOZ_ASSERT(OnDecodeTaskQueue() || NS_IsMainThread());
ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
return mCDMProxy;
}

2
dom/media/mediasource/TrackBuffer.cpp
View File

@ -874,7 +874,7 @@ TrackBuffer::AbortAppendData()
const nsTArray<nsRefPtr<SourceBufferDecoder>>&
TrackBuffer::Decoders()
{
// XXX assert OnDecodeThread
// XXX assert OnDecodeTaskQueue
return mInitializedDecoders;
}

2
dom/media/webaudio/BufferDecoder.cpp
View File

@ -64,7 +64,7 @@ BufferDecoder::OnStateMachineTaskQueue() const
}
bool
BufferDecoder::OnDecodeThread() const
BufferDecoder::OnDecodeTaskQueue() const
{
MOZ_ASSERT(mTaskQueueIdentity, "Forgot to call BeginDecoding?");
return mTaskQueueIdentity->IsCurrentThreadIn();

2
dom/media/webaudio/BufferDecoder.h
View File

@ -36,7 +36,7 @@ public:
virtual bool OnStateMachineTaskQueue() const final override;
virtual bool OnDecodeThread() const final override;
virtual bool OnDecodeTaskQueue() const final override;
virtual MediaResource* GetResource() const final override;

2
dom/media/webm/WebMReader.cpp
View File

@ -332,7 +332,7 @@ nsresult WebMReader::ReadMetadata(MediaInfo* aInfo,
// We can't use OnTaskQueue() here because of the wacky initialization task
// queue that TrackBuffer uses. We should be able to fix this when we do
// bug 1148234.
MOZ_ASSERT(mDecoder->OnDecodeThread());
MOZ_ASSERT(mDecoder->OnDecodeTaskQueue());
nestegg_io io;
io.read = webm_read;