Changeset View
Changeset View
Standalone View
Standalone View
www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
| Enable FLAC on platforms without ffvpx like powerpc* | Enable FLAC on platforms without ffvpx like powerpc* | ||||
| diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp | diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp | ||||
| index 53fc3c9937f7..b23771ab80fa 100644 | index 53fc3c9937f7..b23771ab80fa 100644 | ||||
| --- dom/media/flac/FlacDecoder.cpp | --- dom/media/flac/FlacDecoder.cpp | ||||
| +++ dom/media/flac/FlacDecoder.cpp | +++ dom/media/flac/FlacDecoder.cpp | ||||
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||||
| #include "FlacDecoder.h" | #include "FlacDecoder.h" | ||||
| #include "MediaContainerType.h" | #include "MediaContainerType.h" | ||||
| #include "MediaPrefs.h" | #include "mozilla/StaticPrefs.h" | ||||
| +#include "PDMFactory.h" | +#include "PDMFactory.h" | ||||
| namespace mozilla { | namespace mozilla { | ||||
| @@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() | @@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() | ||||
| { | { | ||||
| #ifdef MOZ_FFVPX | #ifdef MOZ_FFVPX | ||||
| return MediaPrefs::FlacEnabled(); | return StaticPrefs::MediaFlacEnabled(); | ||||
| +#elif defined(MOZ_FFMPEG) | +#elif defined(MOZ_FFMPEG) | ||||
| + RefPtr<PDMFactory> platform = new PDMFactory(); | + RefPtr<PDMFactory> platform = new PDMFactory(); | ||||
| + return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), | + return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), | ||||
| + /* DecoderDoctorDiagnostics* */ nullptr); | + /* DecoderDoctorDiagnostics* */ nullptr); | ||||
| #else | #else | ||||
| // Until bug 1295886 is fixed. | // Until bug 1295886 is fixed. | ||||
| return false; | return false; | ||||