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 1148102: P7. Hookup WebMDemuxer. r=jya

Browse Source
This commit is contained in:
Jan Gerber 2015-06-18 15:59:43 +02:00 committed by Jean-Yves Avenard
parent 5b6991d6e5
commit cdcd757ed1
9 changed files with 101 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/DecoderTraits.cpp
View File

@ -23,6 +23,7 @@
#ifdef MOZ_WEBM
#include "WebMDecoder.h"
#include "WebMReader.h"
#include "WebMDemuxer.h"
#endif
#ifdef MOZ_RAW
#include "RawDecoder.h"
@ -698,7 +699,9 @@ MediaDecoderReader* DecoderTraits::CreateReader(const nsACString& aType, Abstrac
#endif
#ifdef MOZ_WEBM
if (IsWebMType(aType)) {
decoderReader = new WebMReader(aDecoder);
decoderReader = Preferences::GetBool("media.format-reader.webm", true) ?
static_cast<MediaDecoderReader*>(new MediaFormatReader(aDecoder, new WebMDemuxer(aDecoder->GetResource()))) :
new WebMReader(aDecoder);
} else
#endif
#ifdef MOZ_DIRECTSHOW

6
dom/media/MediaFormatReader.cpp
View File

@ -258,13 +258,15 @@ bool MediaFormatReader::IsWaitingOnCDMResource() {
bool
MediaFormatReader::IsSupportedAudioMimeType(const nsACString& aMimeType)
{
return mPlatform && mPlatform->SupportsMimeType(aMimeType);
return mPlatform && (mPlatform->SupportsMimeType(aMimeType) ||
PlatformDecoderModule::AgnosticMimeType(aMimeType));
}
bool
MediaFormatReader::IsSupportedVideoMimeType(const nsACString& aMimeType)
{
return mPlatform && mPlatform->SupportsMimeType(aMimeType);
return mPlatform && (mPlatform->SupportsMimeType(aMimeType) ||
PlatformDecoderModule::AgnosticMimeType(aMimeType));
}
nsRefPtr<MediaDecoderReader::MetadataPromise>

8
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -25,6 +25,7 @@
#ifdef MOZ_WEBM
#include "WebMReader.h"
#include "WebMDemuxer.h"
#endif
extern PRLogModuleInfo* GetMediaSourceLog();
@ -718,7 +719,12 @@ CreateReaderForType(const nsACString& aType, AbstractMediaDecoder* aDecoder,
#ifdef MOZ_WEBM
if (DecoderTraits::IsWebMType(aType)) {
return new WebMReader(aDecoder, aBorrowedTaskQueue);
bool useFormatDecoder =
Preferences::GetBool("media.mediasource.format-reader.webm", true);
MediaDecoderReader* reader = useFormatDecoder ?
static_cast<MediaDecoderReader*>(new MediaFormatReader(aDecoder, new WebMDemuxer(aDecoder->GetResource()), aBorrowedTaskQueue)) :
new WebMReader(aDecoder, aBorrowedTaskQueue);
return reader;
}
#endif

40
dom/media/platforms/PlatformDecoderModule.cpp
View File

@ -35,8 +35,13 @@
#include "MediaInfo.h"
#include "H264Converter.h"
#include "OpusDecoder.h"
#include "VorbisDecoder.h"
#include "VPXDecoder.h"
namespace mozilla {
extern already_AddRefed<PlatformDecoderModule> CreateAgnosticDecoderModule();
extern already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule();
bool PlatformDecoderModule::sUseBlankDecoder = false;
@ -124,7 +129,7 @@ PlatformDecoderModule::Create()
if (m && NS_SUCCEEDED(m->Startup())) {
return m.forget();
}
return nullptr;
return CreateAgnosticDecoderModule();
}
/* static */
@ -184,10 +189,22 @@ PlatformDecoderModule::CreateDecoder(const TrackInfo& aConfig,
{
nsRefPtr<MediaDataDecoder> m;
bool hasPlatformDecoder = SupportsMimeType(aConfig.mMimeType);
if (aConfig.GetAsAudioInfo()) {
m = CreateAudioDecoder(*aConfig.GetAsAudioInfo(),
aTaskQueue,
aCallback);
if (!hasPlatformDecoder && VorbisDataDecoder::IsVorbis(aConfig.mMimeType)) {
m = new VorbisDataDecoder(*aConfig.GetAsAudioInfo(),
aTaskQueue,
aCallback);
} else if (!hasPlatformDecoder && OpusDataDecoder::IsOpus(aConfig.mMimeType)) {
m = new OpusDataDecoder(*aConfig.GetAsAudioInfo(),
aTaskQueue,
aCallback);
} else {
m = CreateAudioDecoder(*aConfig.GetAsAudioInfo(),
aTaskQueue,
aCallback);
}
return m.forget();
}
@ -202,6 +219,11 @@ PlatformDecoderModule::CreateDecoder(const TrackInfo& aConfig,
aImageContainer,
aTaskQueue,
aCallback);
} else if (!hasPlatformDecoder && VPXDecoder::IsVPX(aConfig.mMimeType)) {
m = new VPXDecoder(*aConfig.GetAsVideoInfo(),
aImageContainer,
aTaskQueue,
aCallback);
} else {
m = CreateVideoDecoder(*aConfig.GetAsVideoInfo(),
aLayersBackend,
@ -220,4 +242,14 @@ PlatformDecoderModule::SupportsMimeType(const nsACString& aMimeType)
aMimeType.EqualsLiteral("video/avc");
}
/* static */
bool
PlatformDecoderModule::AgnosticMimeType(const nsACString& aMimeType)
{
return VPXDecoder::IsVPX(aMimeType) ||
OpusDataDecoder::IsOpus(aMimeType) ||
VorbisDataDecoder::IsVorbis(aMimeType);
}
} // namespace mozilla

6
dom/media/platforms/PlatformDecoderModule.h
View File

@ -93,6 +93,10 @@ public:
// to be extended
virtual bool SupportsMimeType(const nsACString& aMimeType);
// MimeType can be decoded with shipped decoders if no platform decoders exist
static bool AgnosticMimeType(const nsACString& aMimeType);
enum ConversionRequired {
kNeedNone,
kNeedAVCC,
@ -107,7 +111,7 @@ public:
virtual void DisableHardwareAcceleration() {}
virtual bool SupportsSharedDecoders(const VideoInfo& aConfig) const {
return true;
return !AgnosticMimeType(aConfig.mMimeType);
}
protected:

22
dom/media/platforms/agnostic/BlankDecoderModule.cpp
View File

@ -246,6 +246,11 @@ public:
return true;
}
virtual bool
SupportsSharedDecoders(const VideoInfo& aConfig) const override {
return false;
}
virtual ConversionRequired
DecoderNeedsConversion(const TrackInfo& aConfig) const override
{
@ -254,10 +259,27 @@ public:
};
class AgnosticDecoderModule : public BlankDecoderModule {
public:
bool SupportsMimeType(const nsACString& aMimeType) override
{
// This module does not support any decoders itself,
// agnostic decoders are created in PlatformDecoderModule::CreateDecoder
return false;
}
};
already_AddRefed<PlatformDecoderModule> CreateBlankDecoderModule()
{
nsRefPtr<PlatformDecoderModule> pdm = new BlankDecoderModule();
return pdm.forget();
}
already_AddRefed<PlatformDecoderModule> CreateAgnosticDecoderModule()
{
nsRefPtr<PlatformDecoderModule> adm = new AgnosticDecoderModule();
return adm.forget();
}
} // namespace mozilla

13
dom/media/platforms/wmf/WMFDecoderModule.cpp
View File

@ -26,6 +26,7 @@ namespace mozilla {
static bool sIsWMFEnabled = false;
static bool sDXVAEnabled = false;
static int sNumDecoderThreads = -1;
static bool sIsIntelDecoderEnabled = false;
WMFDecoderModule::WMFDecoderModule()
: mWMFInitialized(false)
@ -44,6 +45,7 @@ void
WMFDecoderModule::DisableHardwareAcceleration()
{
sDXVAEnabled = false;
sIsIntelDecoderEnabled = false;
}
static void
@ -72,6 +74,7 @@ WMFDecoderModule::Init()
MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
sIsWMFEnabled = Preferences::GetBool("media.windows-media-foundation.enabled", false);
sDXVAEnabled = gfxPlatform::GetPlatform()->CanUseHardwareVideoDecoding();
sIsIntelDecoderEnabled = Preferences::GetBool("media.webm.intel_decoder.enabled", false);
SetNumOfDecoderThreads();
}
@ -145,7 +148,8 @@ WMFDecoderModule::SupportsSharedDecoders(const VideoInfo& aConfig) const
{
// If DXVA is enabled, but we're not going to use it for this specific config, then
// we can't use the shared decoder.
return !sDXVAEnabled || ShouldUseDXVA(aConfig);
return !AgnosticMimeType(aConfig.mMimeType) &&
(!sDXVAEnabled || ShouldUseDXVA(aConfig));
}
bool
@ -153,10 +157,11 @@ WMFDecoderModule::SupportsMimeType(const nsACString& aMimeType)
{
return aMimeType.EqualsLiteral("video/mp4") ||
aMimeType.EqualsLiteral("video/avc") ||
aMimeType.EqualsLiteral("video/webm; codecs=vp8") ||
aMimeType.EqualsLiteral("video/webm; codecs=vp9") ||
aMimeType.EqualsLiteral("audio/mp4a-latm") ||
aMimeType.EqualsLiteral("audio/mpeg");
aMimeType.EqualsLiteral("audio/mpeg") ||
(sIsIntelDecoderEnabled &&
(aMimeType.EqualsLiteral("video/webm; codecs=vp8") ||
aMimeType.EqualsLiteral("video/webm; codecs=vp9")));
}
PlatformDecoderModule::ConversionRequired

10
dom/media/webm/WebMDecoder.cpp
View File

@ -4,7 +4,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Preferences.h"
#include "MediaDecoderStateMachine.h"
#include "MediaFormatReader.h"
#include "WebMDemuxer.h"
#include "WebMReader.h"
#include "WebMDecoder.h"
@ -12,7 +15,12 @@ namespace mozilla {
MediaDecoderStateMachine* WebMDecoder::CreateStateMachine()
{
return new MediaDecoderStateMachine(this, new WebMReader(this));
bool useFormatDecoder =
Preferences::GetBool("media.format-reader.webm", true);
nsRefPtr<MediaDecoderReader> reader = useFormatDecoder ?
static_cast<MediaDecoderReader*>(new MediaFormatReader(this, new WebMDemuxer(GetResource()))) :
new WebMReader(this);
return new MediaDecoderStateMachine(this, reader);
}
} // namespace mozilla

5
modules/libpref/init/all.js
View File

@ -480,6 +480,11 @@ pref("media.mediasource.format-reader.mp4", true);
// Enable new MediaFormatReader architecture for plain mp4.
pref("media.format-reader.mp4", true);
// Enable new MediaFormatReader architecture for webm in MSE
pref("media.mediasource.format-reader.webm", false);
// Enable new MediaFormatReader architecture for plain webm.
pref("media.format-reader.webm", false);
#ifdef MOZ_WEBSPEECH
pref("media.webspeech.recognition.enable", false);
pref("media.webspeech.synth.enabled", false);