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 1208922. Part 2 - add MediaDecoderReader::SetCDMProxy so it won't need to ask MediaDecoder for a CDMProxy. r=cpearce.

Browse Source
This commit is contained in:
JW Wang 2015-09-27 18:40:03 +08:00
parent b1a98a827c
commit 480aaa8ac6
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/MediaDecoderReader.h
View File

@ -20,6 +20,7 @@
namespace mozilla {
class CDMProxy;
class MediaDecoderReader;
struct WaitForDataRejectValue
@ -195,6 +196,10 @@ public:
// when to call SetIdle().
virtual void SetIdle() { }
#ifdef MOZ_EME
virtual void SetCDMProxy(CDMProxy* aProxy) {}
#endif
// Tell the reader that the data decoded are not for direct playback, so it
// can accept more files, in particular those which have more channels than
// available in the audio output.

41
dom/media/MediaFormatReader.cpp
View File

@ -213,29 +213,22 @@ private:
nsTArray<uint8_t> mInitData;
nsString mInitDataType;
};
void
MediaFormatReader::SetCDMProxy(CDMProxy* aProxy)
{
nsRefPtr<CDMProxy> proxy = aProxy;
nsRefPtr<MediaFormatReader> self = this;
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([=] () {
self->mCDMProxy = proxy;
});
OwnerThread()->DispatchDirectTask(r.forget());
}
#endif // MOZ_EME
bool MediaFormatReader::IsWaitingOnCDMResource() {
#ifdef MOZ_EME
nsRefPtr<CDMProxy> proxy;
{
if (!IsEncrypted()) {
// Not encrypted, no need to wait for CDMProxy.
return false;
}
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
proxy = mDecoder->GetCDMProxy();
if (!proxy) {
// We're encrypted, we need a CDMProxy to decrypt file.
return true;
}
}
// We'll keep waiting if the CDM hasn't informed Gecko of its capabilities.
{
CDMCaps::AutoLock caps(proxy->Capabilites());
LOG("capsKnown=%d", caps.AreCapsKnown());
return !caps.AreCapsKnown();
}
return IsEncrypted() && !mCDMProxy;
#else
return false;
#endif
@ -392,18 +385,14 @@ MediaFormatReader::EnsureDecodersCreated()
// even if EME is disabled, so that if script tries and fails to create
// a CDM, we can detect that and notify chrome and show some UI
// explaining that we failed due to EME being disabled.
nsRefPtr<CDMProxy> proxy;
{
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
proxy = mDecoder->GetCDMProxy();
MOZ_ASSERT(proxy);
CDMCaps::AutoLock caps(proxy->Capabilites());
MOZ_ASSERT(mCDMProxy);
CDMCaps::AutoLock caps(mCDMProxy->Capabilites());
mInfo.mVideo.mIsRenderedExternally = caps.CanRenderVideo();
mInfo.mAudio.mIsRenderedExternally = caps.CanRenderAudio();
}
mPlatform = PlatformDecoderModule::CreateCDMWrapper(proxy);
mPlatform = PlatformDecoderModule::CreateCDMWrapper(mCDMProxy);
NS_ENSURE_TRUE(mPlatform, false);
#else
// EME not supported.

6
dom/media/MediaFormatReader.h
View File

@ -17,6 +17,8 @@
namespace mozilla {
class CDMProxy;
class MediaFormatReader final : public MediaDecoderReader
{
typedef TrackInfo::TrackType TrackType;
@ -93,6 +95,10 @@ public:
return mTrackDemuxersMayBlock;
}
#ifdef MOZ_EME
void SetCDMProxy(CDMProxy* aProxy) override;
#endif
private:
bool InitDemuxer();
// Notify the demuxer that new data has been received.