зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1505284) for GTest crashes on [@ mozilla::AppleDecoderModule::Init()] . CLOSED TREE
Backed out changeset 1d3eb26cfeac (bug 1505284) Backed out changeset 05fd55926206 (bug 1505284)
This commit is contained in:
Родитель
4ea282427e
Коммит
8b9e60f605
|
@ -7,11 +7,10 @@
|
|||
#ifndef __FFmpegDecoderModule_h__
|
||||
#define __FFmpegDecoderModule_h__
|
||||
|
||||
#include "FFmpegAudioDecoder.h"
|
||||
#include "FFmpegLibWrapper.h"
|
||||
#include "FFmpegVideoDecoder.h"
|
||||
#include "PlatformDecoderModule.h"
|
||||
#include "VPXDecoder.h"
|
||||
#include "FFmpegLibWrapper.h"
|
||||
#include "FFmpegAudioDecoder.h"
|
||||
#include "FFmpegVideoDecoder.h"
|
||||
#include "mozilla/StaticPrefs.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -38,12 +37,8 @@ class FFmpegDecoderModule : public PlatformDecoderModule {
|
|||
if (aParams.VideoConfig().HasAlpha()) {
|
||||
return nullptr;
|
||||
}
|
||||
if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType) &&
|
||||
aParams.mOptions.contains(CreateDecoderParams::Option::LowLatency) &&
|
||||
if (aParams.mOptions.contains(CreateDecoderParams::Option::LowLatency) &&
|
||||
!StaticPrefs::MediaFfmpegLowLatencyEnabled()) {
|
||||
// We refuse to create a decoder with low latency enabled if it's VP8 or
|
||||
// VP9 unless specifically allowed: this will fallback to libvpx later.
|
||||
// decoder
|
||||
return nullptr;
|
||||
}
|
||||
RefPtr<MediaDataDecoder> decoder = new FFmpegVideoDecoder<V>(
|
||||
|
|
|
@ -1126,7 +1126,7 @@ VARCACHE_PREF(
|
|||
VARCACHE_PREF(
|
||||
"media.navigator.mediadatadecoder_h264_enabled",
|
||||
MediaNavigatorMediadatadecoderH264Enabled,
|
||||
RelaxedAtomicBool, true
|
||||
bool, false
|
||||
)
|
||||
#endif // MOZ_WEBRTC
|
||||
|
||||
|
|
|
@ -463,7 +463,6 @@ pref("media.navigator.video.max_fr", 60);
|
|||
pref("media.navigator.video.h264.level", 31); // 0x42E01f - level 3.1
|
||||
pref("media.navigator.video.h264.max_br", 0);
|
||||
pref("media.navigator.video.h264.max_mbps", 0);
|
||||
pref("media.navigator.mediadatadecoder_h264_enabled", true);
|
||||
pref("media.peerconnection.video.vp9_enabled", true);
|
||||
pref("media.peerconnection.video.vp9_preferred", false);
|
||||
pref("media.getusermedia.browser.enabled", false);
|
||||
|
|
Загрузка…
Ссылка в новой задаче