Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1390748 - Remove OggDecoder::CreateStateMachine(). r=jwwang

Browse Source 
MozReview-Commit-ID: 2JgZ2Ppv6as

--HG--
extra : rebase_source : 5ce2fe9136dcd32f62f7de0e85523cdcda8fa206
This commit is contained in:
Chris Pearce 2017-08-15 16:21:35 +12:00
parent 4e7084d568
commit 502cbde454
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/DecoderTraits.cpp
View File

@ -311,7 +311,10 @@ DecoderTraits::CreateReader(const MediaContainerType& aType,
decoderReader = new MediaFormatReader(aInit, new FlacDemuxer(resource));
} else
if (OggDecoder::IsSupportedType(aType)) {
decoderReader = new MediaFormatReader(aInit, new OggDemuxer(resource));
RefPtr<OggDemuxer> demuxer = new OggDemuxer(resource);
decoderReader = new MediaFormatReader(aInit, demuxer);
demuxer->SetChainingEvents(&decoderReader->TimedMetadataProducer(),
&decoderReader->MediaNotSeekableProducer());
} else
if (WebMDecoder::IsSupportedType(aType)) {
decoderReader = new MediaFormatReader(aInit, new WebMDemuxer(resource));

14
dom/media/ogg/OggDecoder.cpp
View File

@ -13,20 +13,6 @@
namespace mozilla {
MediaDecoderStateMachine* OggDecoder::CreateStateMachine()
{
RefPtr<OggDemuxer> demuxer = new OggDemuxer(mResource);
MediaFormatReaderInit init;
init.mVideoFrameContainer = GetVideoFrameContainer();
init.mKnowsCompositor = GetCompositor();
init.mCrashHelper = GetOwner()->CreateGMPCrashHelper();
init.mFrameStats = mFrameStats;
mReader = new MediaFormatReader(init, demuxer);
demuxer->SetChainingEvents(&mReader->TimedMetadataProducer(),
&mReader->MediaNotSeekableProducer());
return new MediaDecoderStateMachine(this, mReader);
}
/* static */
bool
OggDecoder::IsSupportedType(const MediaContainerType& aContainerType)

2
dom/media/ogg/OggDecoder.h
View File

@ -19,8 +19,6 @@ public:
: ChannelMediaDecoder(aInit)
{}
MediaDecoderStateMachine* CreateStateMachine() override;
// Returns true if aContainerType is an Ogg type that we think we can render
// with an enabled platform decoder backend.
// If provided, codecs are checked for support.