Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1690661 - use CanHandleContainerType() for asking if the container type is supported. r=bryce

Browse Source 
Doing that allows us to accquire the error information from the `DecoderDoctorDiagnostics`.

Differential Revision: https://phabricator.services.mozilla.com/D106676
This commit is contained in:
alwu 2021-03-01 20:30:58 +00:00
parent c24ecdc6f5
commit 62fa458f40
5 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/ChannelMediaDecoder.cpp
View File

@ -172,9 +172,8 @@ already_AddRefed<ChannelMediaDecoder> ChannelMediaDecoder::Create(
MediaDecoderInit& aInit, DecoderDoctorDiagnostics* aDiagnostics) {
MOZ_ASSERT(NS_IsMainThread());
RefPtr<ChannelMediaDecoder> decoder;
const MediaContainerType& type = aInit.mContainerType;
if (DecoderTraits::IsSupportedType(type)) {
if (DecoderTraits::CanHandleContainerType(aInit.mContainerType,
aDiagnostics) != CANPLAY_NO) {
decoder = new ChannelMediaDecoder(aInit);
return decoder.forget();
}
@ -189,7 +188,8 @@ bool ChannelMediaDecoder::CanClone() {
already_AddRefed<ChannelMediaDecoder> ChannelMediaDecoder::Clone(
MediaDecoderInit& aInit) {
if (!mResource || !DecoderTraits::IsSupportedType(aInit.mContainerType)) {
if (!mResource || DecoderTraits::CanHandleContainerType(
aInit.mContainerType, nullptr) == CANPLAY_NO) {
return nullptr;
}
RefPtr<ChannelMediaDecoder> decoder = new ChannelMediaDecoder(aInit);

22
dom/media/DecoderTraits.cpp
View File

@ -281,28 +281,6 @@ MediaFormatReader* DecoderTraits::CreateReader(const MediaContainerType& aType,
return decoderReader;
}
/* static */
bool DecoderTraits::IsSupportedType(const MediaContainerType& aType) {
typedef bool (*IsSupportedFunction)(const MediaContainerType& aType);
static const IsSupportedFunction funcs[] = {
&ADTSDecoder::IsSupportedType,
&FlacDecoder::IsSupportedType,
&MP3Decoder::IsSupportedType,
#ifdef MOZ_FMP4
&MP4Decoder::IsSupportedTypeWithoutDiagnostics,
#endif
&OggDecoder::IsSupportedType,
&WaveDecoder::IsSupportedType,
&WebMDecoder::IsSupportedType,
};
for (IsSupportedFunction func : funcs) {
if (func(aType)) {
return true;
}
}
return false;
}
/* static */
bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType) {
// Forbid playing media in video documents if the user has opted

2
dom/media/DecoderTraits.h
View File

@ -63,8 +63,6 @@ class DecoderTraits {
// Returns true if aType is matroska type.
static bool IsMatroskaType(const MediaContainerType& aType);
static bool IsSupportedType(const MediaContainerType& aType);
// Returns an array of all TrackInfo objects described by this type.
static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
const MediaContainerType& aType);

6
dom/media/mp4/MP4Decoder.cpp
View File

@ -39,12 +39,6 @@ static bool IsWhitelistedH264Codec(const nsAString& aCodec) {
profile == H264_PROFILE_EXTENDED || profile == H264_PROFILE_HIGH);
}
/* static */
bool MP4Decoder::IsSupportedTypeWithoutDiagnostics(
const MediaContainerType& aContainerType) {
return IsSupportedType(aContainerType, nullptr);
}
static bool IsTypeValid(const MediaContainerType& aType) {
// Whitelist MP4 types, so they explicitly match what we encounter on
// the web, as opposed to what we use internally (i.e. what our demuxers

3
dom/media/mp4/MP4Decoder.h
View File

@ -26,9 +26,6 @@ class MP4Decoder {
static bool IsSupportedType(const MediaContainerType& aContainerType,
DecoderDoctorDiagnostics* aDiagnostics);
static bool IsSupportedTypeWithoutDiagnostics(
const MediaContainerType& aContainerType);
// Return true if aMimeType is a one of the strings used by our demuxers to
// identify H264. Does not parse general content type strings, i.e. white
// space matters.