Browse Source

build bustage

Bill Gianopoulos 4 years ago
parent
commit
51c3892e9c
1 changed files with 5 additions and 4 deletions
  1. 5 4
      rel-257/libdav1d/patches/1493400-4-libdav1d-65a1.patch

+ 5 - 4
rel-257/libdav1d/patches/1493400-4-libdav1d-65a1.patch

@@ -28,7 +28,7 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
      const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) const {
      const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics) const {
    bool supports = VPXDecoder::IsVPX(aMimeType) ||
    bool supports = VPXDecoder::IsVPX(aMimeType) ||
                    OpusDataDecoder::IsOpus(aMimeType) ||
                    OpusDataDecoder::IsOpus(aMimeType) ||
-@@ -42,17 +43,20 @@ already_AddRefed<MediaDataDecoder> Agnos
+@@ -42,17 +43,21 @@ already_AddRefed<MediaDataDecoder> Agnos
    RefPtr<MediaDataDecoder> m;
    RefPtr<MediaDataDecoder> m;
  
  
    if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType)) {
    if (VPXDecoder::IsVPX(aParams.mConfig.mMimeType)) {
@@ -38,10 +38,11 @@ diff --git a/dom/media/platforms/agnostic/AgnosticDecoderModule.cpp b/dom/media/
    else if (AOMDecoder::IsAV1(aParams.mConfig.mMimeType) &&
    else if (AOMDecoder::IsAV1(aParams.mConfig.mMimeType) &&
             MediaPrefs::AV1Enabled()) {
             MediaPrefs::AV1Enabled()) {
 -    m = new AOMDecoder(aParams);
 -    m = new AOMDecoder(aParams);
-+    if (MediaPrefs::UseDav1d()) {
-+      m = new Dav1dDecoder(aParams);
-+    } else{
++    if (Preferences::GetBool("media.av1.use-dav1d" ,true)) {
++      m = new DAV1DDecoder(aParams);
++    } else {
 +      m = new AOMDecoder(aParams);
 +      m = new AOMDecoder(aParams);
++    }
    }
    }
  #endif
  #endif
    else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType)) {
    else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType)) {