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 1193670: P1. Remove use of SharedDecoderManager. r=cpearce

Browse Source
This commit is contained in:
Jean-Yves Avenard 2015-09-14 19:11:31 +10:00
parent a6dacb6716
commit f66be846e2
2 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dom/media/MediaFormatReader.cpp
View File

@ -14,7 +14,6 @@
#include "MediaInfo.h" #include "MediaInfo.h"
#include "MediaFormatReader.h" #include "MediaFormatReader.h"
#include "MediaResource.h" #include "MediaResource.h"
#include "SharedDecoderManager.h"
#include "mozilla/SharedThreadPool.h" #include "mozilla/SharedThreadPool.h"
#include "VideoUtils.h" #include "VideoUtils.h"
@ -441,33 +440,17 @@ MediaFormatReader::EnsureDecodersCreated()
false); false);
mVideo.mDecoderInitialized = false; mVideo.mDecoderInitialized = false;
// If we've disabled hardware acceleration for this reader, then we can't use // Decoders use the layers backend to decide if they can use hardware decoding,
// the shared decoder. // so specify LAYERS_NONE if we want to forcibly disable it.
if (mSharedDecoderManager && mVideo.mDecoder =
mPlatform->SupportsSharedDecoders(mInfo.mVideo) && mPlatform->CreateDecoder(mVideo.mInfo ?
!mHardwareAccelerationDisabled) { *mVideo.mInfo->GetAsVideoInfo() :
mVideo.mDecoder = mInfo.mVideo,
mSharedDecoderManager->CreateVideoDecoder(mPlatform, mVideo.mTaskQueue,
mVideo.mInfo ? mVideo.mCallback,
*mVideo.mInfo->GetAsVideoInfo() : mHardwareAccelerationDisabled ? LayersBackend::LAYERS_NONE :
mInfo.mVideo, mLayersBackendType,
mLayersBackendType, mDecoder->GetImageContainer());
mDecoder->GetImageContainer(),
mVideo.mTaskQueue,
mVideo.mCallback);
} else {
// Decoders use the layers backend to decide if they can use hardware decoding,
// so specify LAYERS_NONE if we want to forcibly disable it.
mVideo.mDecoder =
mPlatform->CreateDecoder(mVideo.mInfo ?
*mVideo.mInfo->GetAsVideoInfo() :
mInfo.mVideo,
mVideo.mTaskQueue,
mVideo.mCallback,
mHardwareAccelerationDisabled ? LayersBackend::LAYERS_NONE :
mLayersBackendType,
mDecoder->GetImageContainer());
}
NS_ENSURE_TRUE(mVideo.mDecoder != nullptr, false); NS_ENSURE_TRUE(mVideo.mDecoder != nullptr, false);
} }
@ -1606,22 +1589,6 @@ void MediaFormatReader::ReleaseMediaResources()
} }
} }
void
MediaFormatReader::SetIdle()
{
if (mSharedDecoderManager && mVideo.mDecoder) {
mSharedDecoderManager->SetIdle(mVideo.mDecoder);
}
}
void
MediaFormatReader::SetSharedDecoderManager(SharedDecoderManager* aManager)
{
#if !defined(MOZ_WIDGET_ANDROID)
mSharedDecoderManager = aManager;
#endif
}
bool bool
MediaFormatReader::VideoIsHardwareAccelerated() const MediaFormatReader::VideoIsHardwareAccelerated() const
{ {

5
dom/media/MediaFormatReader.h
View File

@ -71,10 +71,7 @@ public:
virtual bool ForceZeroStartTime() const override; virtual bool ForceZeroStartTime() const override;
// For Media Resource Management // For Media Resource Management
void SetIdle() override;
void ReleaseMediaResources() override; void ReleaseMediaResources() override;
void SetSharedDecoderManager(SharedDecoderManager* aManager)
override;
nsresult ResetDecode() override; nsresult ResetDecode() override;
@ -434,8 +431,6 @@ private:
nsRefPtr<CDMProxy> mCDMProxy; nsRefPtr<CDMProxy> mCDMProxy;
#endif #endif
nsRefPtr<SharedDecoderManager> mSharedDecoderManager;
#if defined(READER_DORMANT_HEURISTIC) #if defined(READER_DORMANT_HEURISTIC)
const bool mDormantEnabled; const bool mDormantEnabled;
#endif #endif