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 1013032 - Initialize pending subdecoders directly rather than waiting on a task (that may be blocked) to do it. r=cajbir

Browse Source
This commit is contained in:
Matthew Gregan 2014-05-19 19:59:00 +12:00
parent acfc7f9b64
commit 13d60a8552
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/media/mediasource/MediaSourceDecoder.cpp
View File

@ -128,14 +128,14 @@ public:
already_AddRefed<SubBufferDecoder> CreateSubDecoder(const nsACString& aType, already_AddRefed<SubBufferDecoder> CreateSubDecoder(const nsACString& aType,
MediaSourceDecoder* aParentDecoder); MediaSourceDecoder* aParentDecoder);
void CallDecoderInitialization(); void InitializePendingDecoders();
private: private:
bool MaybeSwitchVideoReaders(int64_t aTimeThreshold) { bool MaybeSwitchVideoReaders(int64_t aTimeThreshold) {
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
MOZ_ASSERT(mActiveVideoDecoder != -1); MOZ_ASSERT(mActiveVideoDecoder != -1);
WaitForPendingDecoders(); InitializePendingDecoders();
for (uint32_t i = mActiveVideoDecoder + 1; i < mDecoders.Length(); ++i) { for (uint32_t i = mActiveVideoDecoder + 1; i < mDecoders.Length(); ++i) {
if (!mDecoders[i]->GetReader()->GetMediaInfo().HasVideo()) { if (!mDecoders[i]->GetReader()->GetMediaInfo().HasVideo()) {
@ -168,8 +168,6 @@ private:
return mDecoders[mActiveVideoDecoder]->GetReader(); return mDecoders[mActiveVideoDecoder]->GetReader();
} }
void WaitForPendingDecoders();
nsTArray<nsRefPtr<SubBufferDecoder>> mPendingDecoders; nsTArray<nsRefPtr<SubBufferDecoder>> mPendingDecoders;
nsTArray<nsRefPtr<SubBufferDecoder>> mDecoders; nsTArray<nsRefPtr<SubBufferDecoder>> mDecoders;
@ -202,15 +200,15 @@ public:
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
return mDecodeTaskQueue->Dispatch(NS_NewRunnableMethod(this, return mDecodeTaskQueue->Dispatch(NS_NewRunnableMethod(this,
&MediaSourceStateMachine::CallDecoderInitialization)); &MediaSourceStateMachine::InitializePendingDecoders));
} }
private: private:
void CallDecoderInitialization() { void InitializePendingDecoders() {
if (!mReader) { if (!mReader) {
return; return;
} }
static_cast<MediaSourceReader*>(mReader.get())->CallDecoderInitialization(); static_cast<MediaSourceReader*>(mReader.get())->InitializePendingDecoders();
} }
}; };
@ -317,7 +315,7 @@ private:
}; };
void void
MediaSourceReader::CallDecoderInitialization() MediaSourceReader::InitializePendingDecoders()
{ {
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
for (uint32_t i = 0; i < mPendingDecoders.Length(); ++i) { for (uint32_t i = 0; i < mPendingDecoders.Length(); ++i) {
@ -360,16 +358,6 @@ MediaSourceReader::CallDecoderInitialization()
NS_DispatchToMainThread(new ReleaseDecodersTask(mPendingDecoders)); NS_DispatchToMainThread(new ReleaseDecodersTask(mPendingDecoders));
MOZ_ASSERT(mPendingDecoders.IsEmpty()); MOZ_ASSERT(mPendingDecoders.IsEmpty());
mDecoder->NotifyWaitingForResourcesStatusChanged(); mDecoder->NotifyWaitingForResourcesStatusChanged();
mon.NotifyAll();
}
void
MediaSourceReader::WaitForPendingDecoders()
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
while (!mPendingDecoders.IsEmpty()) {
mon.Wait();
}
} }
already_AddRefed<SubBufferDecoder> already_AddRefed<SubBufferDecoder>
@ -439,7 +427,7 @@ MediaSourceReader::ReadMetadata(MediaInfo* aInfo, MetadataTags** aTags)
MSE_DEBUG("%p: MSR::ReadMetadata pending=%u", this, mPendingDecoders.Length()); MSE_DEBUG("%p: MSR::ReadMetadata pending=%u", this, mPendingDecoders.Length());
WaitForPendingDecoders(); InitializePendingDecoders();
MSE_DEBUG("%p: MSR::ReadMetadata decoders=%u", this, mDecoders.Length()); MSE_DEBUG("%p: MSR::ReadMetadata decoders=%u", this, mDecoders.Length());