wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1144519 - Rename MediaDecoderReader::OnDecodeThread to MediaDecoderReader::OnTaskQueue. r=jya

Browse Source
This commit is contained in:
Bobby Holley 2015-03-17 15:16:06 -07:00
parent 135ab8c259
commit ca940f4d38
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/MediaDecoderReader.cpp
View File

@ -195,7 +195,7 @@ MediaDecoderReader::CallReadMetadata()
{
typedef ReadMetadataFailureReason Reason;
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
mDecoder->GetReentrantMonitor().AssertNotCurrentThreadIn();
DECODER_LOG("MediaDecoderReader::CallReadMetadata");
@ -373,7 +373,7 @@ MediaDecoderReader::BreakCycles()
nsRefPtr<ShutdownPromise>
MediaDecoderReader::Shutdown()
{
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
mShutdown = true;
mBaseAudioPromise.RejectIfExists(END_OF_STREAM, __func__);

2
dom/media/MediaDecoderReader.h
View File

@ -112,7 +112,7 @@ public:
MediaTaskQueue* EnsureTaskQueue();
virtual bool OnDecodeThread()
virtual bool OnTaskQueue()
{
return !GetTaskQueue() || GetTaskQueue()->IsCurrentThreadIn();
}

8
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -141,7 +141,7 @@ MediaSourceReader::SizeOfAudioQueueInFrames()
nsRefPtr<MediaDecoderReader::AudioDataPromise>
MediaSourceReader::RequestAudioData()
{
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty(), "No sample requests allowed while seeking");
MOZ_DIAGNOSTIC_ASSERT(mAudioPromise.IsEmpty(), "No duplicate sample requests");
nsRefPtr<AudioDataPromise> p = mAudioPromise.Ensure(__func__);
@ -305,7 +305,7 @@ MediaSourceReader::OnAudioNotDecoded(NotDecodedReason aReason)
nsRefPtr<MediaDecoderReader::VideoDataPromise>
MediaSourceReader::RequestVideoData(bool aSkipToNextKeyframe, int64_t aTimeThreshold)
{
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
MOZ_DIAGNOSTIC_ASSERT(mSeekPromise.IsEmpty(), "No sample requests allowed while seeking");
MOZ_DIAGNOSTIC_ASSERT(mVideoPromise.IsEmpty(), "No duplicate sample requests");
nsRefPtr<VideoDataPromise> p = mVideoPromise.Ensure(__func__);
@ -840,7 +840,7 @@ MediaSourceReader::Seek(int64_t aTime, int64_t aIgnored /* Used only for ogg whi
nsresult
MediaSourceReader::ResetDecode()
{
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
MSE_DEBUG("");
@ -1036,7 +1036,7 @@ MediaSourceReader::GetBuffered(dom::TimeRanges* aBuffered)
nsRefPtr<MediaDecoderReader::WaitForDataPromise>
MediaSourceReader::WaitForData(MediaData::Type aType)
{
MOZ_ASSERT(OnDecodeThread());
MOZ_ASSERT(OnTaskQueue());
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
nsRefPtr<WaitForDataPromise> p = WaitPromise(aType).Ensure(__func__);
MaybeNotifyHaveData();