Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1688748 - Remove unused variable mPlatform and mEncryptedPlatform from MFR. r=bryce

Browse Source 
no one actually sets these two variables, so they are basically dead variables.

Differential Revision: https://phabricator.services.mozilla.com/D102979
This commit is contained in:
alwu 2021-01-26 19:41:46 +00:00
parent 9a0c36e3c8
commit 16169cdedb
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/media/MediaFormatReader.cpp
View File

@ -16,6 +16,7 @@
#include "MediaData.h"
#include "MediaDataDecoderProxy.h"
#include "MediaInfo.h"
#include "PDMFactory.h"
#include "VideoFrameContainer.h"
#include "VideoUtils.h"
#include "mozilla/AbstractThread.h"
@ -345,15 +346,11 @@ void MediaFormatReader::DecoderFactory::DoCreateDecoder(Data& aData) {
AUTO_PROFILER_LABEL("DecoderFactory::DoCreateDecoder", MEDIA_PLAYBACK);
auto& ownerData = aData.mOwnerData;
auto& decoder = mOwner->GetDecoderData(aData.mTrack);
auto& platform =
decoder.IsEncrypted() ? mOwner->mEncryptedPlatform : mOwner->mPlatform;
if (!platform) {
platform = new PDMFactory();
if (decoder.IsEncrypted()) {
MOZ_ASSERT(mOwner->mCDMProxy);
platform->SetCDMProxy(mOwner->mCDMProxy);
}
RefPtr<PDMFactory> platform = new PDMFactory();
if (decoder.IsEncrypted()) {
MOZ_ASSERT(mOwner->mCDMProxy);
platform->SetCDMProxy(mOwner->mCDMProxy);
}
RefPtr<PlatformDecoderModule::CreateDecoderPromise> p;
@ -981,8 +978,6 @@ RefPtr<ShutdownPromise> MediaFormatReader::TearDownDecoders() {
}
mDecoderFactory = nullptr;
mPlatform = nullptr;
mEncryptedPlatform = nullptr;
mVideoFrameContainer = nullptr;
ReleaseResources();
@ -1080,9 +1075,6 @@ RefPtr<SetCDMPromise> MediaFormatReader::SetCDMProxy(CDMProxy* aProxy) {
mCDMProxy = aProxy;
// Release old PDMFactory which contains an EMEDecoderModule.
mEncryptedPlatform = nullptr;
if (!mInitDone || mSetCDMForTracks.isEmpty() || !mCDMProxy) {
// 1) MFR is not initialized yet or
// 2) Demuxer is initialized without active audio and video or

4
dom/media/MediaFormatReader.h
View File

@ -12,7 +12,6 @@
# include "MediaEventSource.h"
# include "MediaMetadataManager.h"
# include "MediaPromiseDefs.h"
# include "PDMFactory.h"
# include "PlatformDecoderModule.h"
# include "SeekTarget.h"
# include "mozilla/Atomics.h"
@ -317,9 +316,6 @@ class MediaFormatReader final
// This is called only on TaskQueue.
void NotifyDecoderBenchmarkStore();
RefPtr<PDMFactory> mPlatform;
RefPtr<PDMFactory> mEncryptedPlatform;
enum class DrainState {
None,
DrainRequested,