tor-browser

commit b5d7a2e0eb05fad4a912b933b87a84208342fa50
parent 0195ca0537404ecf05d4cf8db871909f9d2d6df5
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon, 27 Oct 2025 14:57:11 -0600

Bug 1995393 - Vendor libwebrtc from ede7744b38

Upstream commit: https://webrtc.googlesource.com/src/+/ede7744b3887828be0936577e8d34a01f86c9c4d
    Return RTCErrorOr from Encode and deprecate Encode2

    Bug: webrtc:358039777
    Change-Id: Ied246b42bd644d777a8a7c8425c195ce6f06a67e
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/406723
    Reviewed-by: Erik Språng <sprang@webrtc.org>
    Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
    Commit-Queue: Emil Vardar (xWF) <vardar@google.com>
    Cr-Commit-Position: refs/heads/main@{#45475}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/video/corruption_detection/evaluation/file_based_encoder.h
 | 
20
++++++++------------

2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
 # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T20:55:01.633041+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-27T20:56:58.601148+00:00.
 # base of lastest vendoring
-dae5bcef9a
+ede7744b38
diff --git a/third_party/libwebrtc/video/corruption_detection/evaluation/file_based_encoder.h b/third_party/libwebrtc/video/corruption_detection/evaluation/file_based_encoder.h
@@ -29,25 +29,21 @@ class FileBasedEncoder {
   FileBasedEncoder() = default;
   virtual ~FileBasedEncoder() = default;
 
-  // TODO: bugs.webrtc.org/358039777 - Remove.
-  // [[deprecated("Use following Encode2 instead")]]
-  virtual std::string Encode(const TestClip& clip, DataRate bitrate) {
-    RTCErrorOr<std::string> r = Encode2(clip, bitrate);
-    if (r.ok()) {
-      return r.value();
-    } else {
-      return "";
-    }
-  }
-
   // Encodes the raw video clip specified by `clip` given in a Y4M or YUV file.
   // Creates an encoded file where the encoded frames are stored. The encoded
   // path is returned if successful.
   // TODO: bugs.webrtc.org/358039777 - Make pure virtual when all subclasses
   // has implemented this method.
+  virtual RTCErrorOr<std::string> Encode(const TestClip& clip,
+                                         DataRate bitrate) {
+    return Encode2(clip, bitrate);
+  }
+
+  // TODO: bugs.webrtc.org/358039777 - Remove.
+  [[deprecated("Use above Encode instead")]]
   virtual RTCErrorOr<std::string> Encode2(const TestClip& clip,
                                           DataRate bitrate) {
-    return RTCError(RTCErrorType::UNSUPPORTED_OPERATION);
+    return Encode(clip, bitrate);
   }
 
   // Returns the used codec for encoding.