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

Bug 1143987: Use SharedDecoderManager with EME PDM. r=cpearce

Browse Source 
--HG--
extra : rebase_source : cf3c5fff87bdca3b55d10e41d5b4f44678253c72
This commit is contained in:
Jean-Yves Avenard 2015-03-18 14:10:59 +11:00
parent c0f007c90f
commit 09f736c2cc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/media/fmp4/MP4Reader.cpp
View File

@ -486,9 +486,7 @@ MP4Reader::ReadMetadata(MediaInfo* aInfo,
mInfo.mVideo.mDisplay = mInfo.mVideo.mDisplay =
nsIntSize(video.display_width, video.display_height); nsIntSize(video.display_width, video.display_height);
mVideo.mCallback = new DecoderCallback(this, kVideo); mVideo.mCallback = new DecoderCallback(this, kVideo);
if (!mIsEncrypted && mSharedDecoderManager) { if (mSharedDecoderManager) {
// Note: Don't use SharedDecoderManager in EME content, as it doesn't
// handle reiniting the decoder properly yet.
mVideo.mDecoder = mVideo.mDecoder =
mSharedDecoderManager->CreateVideoDecoder(mPlatform, mSharedDecoderManager->CreateVideoDecoder(mPlatform,
video, video,
@ -580,7 +578,7 @@ MP4Reader::GetNextKeyframeTime()
void void
MP4Reader::DisableHardwareAcceleration() MP4Reader::DisableHardwareAcceleration()
{ {
if (HasVideo() && !mIsEncrypted && mSharedDecoderManager) { if (HasVideo() && mSharedDecoderManager) {
mPlatform->DisableHardwareAcceleration(); mPlatform->DisableHardwareAcceleration();
const VideoDecoderConfig& video = mDemuxer->VideoConfig(); const VideoDecoderConfig& video = mDemuxer->VideoConfig();
@ -1111,9 +1109,7 @@ void MP4Reader::NotifyResourcesStatusChanged()
void void
MP4Reader::SetIdle() MP4Reader::SetIdle()
{ {
if (!mIsEncrypted && mSharedDecoderManager && mVideo.mDecoder) { if (mSharedDecoderManager && mVideo.mDecoder) {
// Note: Don't use SharedDecoderManager in EME content, as it doesn't
// handle reiniting the decoder properly yet.
mSharedDecoderManager->SetIdle(mVideo.mDecoder); mSharedDecoderManager->SetIdle(mVideo.mDecoder);
NotifyResourcesStatusChanged(); NotifyResourcesStatusChanged();
} }