Bug 1995393 - Vendor libwebrtc from 8e8480de52

Upstream commit: https://webrtc.googlesource.com/src/+/8e8480de52505e4a086010b4732ce1197bc17139
    Calculate video encode PSNR (in supported codecs)

    the Y, U and V components, applications can do a weighted average.

    https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-psnrsum

    Depends on
      cisco/openh264#3824 (for OpenH264)
      https://chromium-review.googlesource.com/c/webm/libvpx/+/6167966 (libvpx)
      https://aomedia-review.googlesource.com/c/aom/+/196501 (libaom)

    This CL implements the codec changes,
      https://webrtc-review.googlesource.com/c/src/+/375021
    is a follow-up to wire up getStats.

    BUG=webrtc:388070060

    Change-Id: I7046158a7b6e4183a9ec939fcac94eee9d65530d
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/368960
    Reviewed-by: Erik Språng <sprangwebrtc.org>
    Commit-Queue: Philipp Hancke <phanckemeta.com>
    Reviewed-by: Harald Alvestrand <htawebrtc.org>
    Cr-Commit-Position: refs/heads/main{#45312}

UltraBlame original commit: befe911a3f68a9dc904c9ae60f4e3d2262e5c1ea

Author: marco-c

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-22T20:59:28.116125+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-22T21:02:26.587370+00:00.
 # base of lastest vendoring
-b7bde5ab8a
+8e8480de52

third_party/libwebrtc/api/video/encoded_image.h

@@ -78,6 +78,13 @@ class RTC_EXPORT EncodedImageBuffer : public EncodedImageBufferInterface {
 
 class RTC_EXPORT EncodedImage {
  public:
+  
+  struct Psnr {
+    double y = 0.0;
+    double u = 0.0;
+    double v = 0.0;
+  };
+
   EncodedImage();
   EncodedImage(EncodedImage&&);
   EncodedImage(const EncodedImage&);
@@ -260,6 +267,9 @@ class RTC_EXPORT EncodedImage {
   EncodedImage::Timing video_timing() const { return timing_; }
   EncodedImage::Timing* video_timing_mutable() { return &timing_; }
 
+  std::optional<Psnr> psnr() const { return psnr_; }
+  void set_psnr(std::optional<Psnr> psnr) { psnr_ = psnr; }
+
  private:
   size_t capacity() const { return encoded_data_ ? encoded_data_->size() : 0; }
 
@@ -296,6 +306,9 @@ class RTC_EXPORT EncodedImage {
 
   std::optional<CorruptionDetectionFilterSettings>
       corruption_detection_filter_settings_;
+
+  
+  std::optional<Psnr> psnr_;
 };
 
 }  

third_party/libwebrtc/call/BUILD.gn

@@ -409,6 +409,7 @@ rtc_library("video_send_stream_api") {
     "../api/adaptation:resource_adaptation_api",
     "../api/crypto:options",
     "../api/units:data_rate",
+    "../api/video:encoded_image",
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
@@ -648,7 +649,6 @@ if (rtc_include_tests) {
         "../system_wrappers:metrics",
         "../test:encoder_settings",
         "../test:fake_video_codecs",
-        "../test:field_trial",
         "../test:fileutils",
         "../test:frame_generator_capturer",
         "../test:test_common",
@@ -659,6 +659,7 @@ if (rtc_include_tests) {
         "../test/network:simulated_network",
         "../video/config:encoder_config",
         "//third_party/abseil-cpp/absl/flags:flag",
+        "//third_party/abseil-cpp/absl/strings",
         "//third_party/abseil-cpp/absl/strings:string_view",
       ]
     }

third_party/libwebrtc/call/video_send_stream.h

@@ -27,6 +27,7 @@
 #include "api/rtp_sender_setparameters_callback.h"
 #include "api/scoped_refptr.h"
 #include "api/units/data_rate.h"
+#include "api/video/encoded_image.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_source_interface.h"
@@ -94,6 +95,8 @@ class VideoSendStream {
     double encode_frame_rate = 0.0;
     int frames_encoded = 0;
     std::optional<uint64_t> qp_sum;
+    EncodedImage::Psnr psnr_sum;
+    uint64_t psnr_measurements = 0;
     uint64_t total_encode_time_ms = 0;
     uint64_t total_encoded_bytes_target = 0;
     uint32_t huge_frames_sent = 0;

third_party/libwebrtc/experiments/field_trials.py

@@ -197,6 +197,9 @@ def bug_url(self) -> str:
     FieldTrial('WebRTC-VP9-SvcForSimulcast',
                347737882,
                date(2024, 10, 1)),
+    FieldTrial('WebRTC-Video-CalculatePsnr',
+               388070060,
+               date(2026, 1, 1)),
     FieldTrial('WebRTC-Video-EnableRetransmitAllLayers',
                42225262,
                date(2024, 4, 1)),

third_party/libwebrtc/media/BUILD.gn

@@ -352,6 +352,7 @@ rtc_source_set("media_channel") {
     "../api/units:data_rate",
     "../api/units:time_delta",
     "../api/units:timestamp",
+    "../api/video:encoded_image",
     "../api/video:recordable_encoded_frame",
     "../api/video:video_frame",
     "../api/video:video_rtp_headers",
@@ -371,6 +372,7 @@ rtc_source_set("media_channel") {
     "../rtc_base/network:sent_packet",
     "../video/config:encoder_config",
     "//third_party/abseil-cpp/absl/functional:any_invocable",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/strings:string_view",
   ]
 }
@@ -760,8 +762,8 @@ if (rtc_build_dcsctp) {
       "../api:rtc_error",
       "../api:sequence_checker",
       "../api/environment",
+      "../api/task_queue",
       "../api/task_queue:pending_task_safety_flag",
-      "../api/task_queue:task_queue",
       "../api/transport:datagram_transport_interface",
       "../net/dcsctp/public:factory",
       "../net/dcsctp/public:socket",
@@ -770,6 +772,7 @@ if (rtc_build_dcsctp) {
       "../net/dcsctp/timer:task_queue_timeout",
       "../p2p:dtls_transport_internal",
       "../p2p:packet_transport_internal",
+      "../rtc_base:async_packet_socket",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
       "../rtc_base:event_tracer",
@@ -781,9 +784,9 @@ if (rtc_build_dcsctp) {
       "../rtc_base:threading",
       "../rtc_base/containers:flat_map",
       "../rtc_base/network:received_packet",
-      "../rtc_base/third_party/sigslot:sigslot",
+      "../rtc_base/third_party/sigslot",
       "../system_wrappers",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
   }
 }

third_party/libwebrtc/media/base/media_channel.h

@@ -43,6 +43,7 @@
 #include "api/units/data_rate.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "api/video/encoded_image.h"
 #include "api/video/recordable_encoded_frame.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_sink_interface.h"
@@ -593,8 +594,12 @@ struct VideoSenderInfo : public MediaSenderInfo {
 
   uint64_t total_encoded_bytes_target = 0;
   bool has_entered_low_resolution = false;
+  
   std::optional<uint64_t> qp_sum;
   VideoContentType content_type = VideoContentType::UNSPECIFIED;
+  
+  webrtc::EncodedImage::Psnr psnr_sum;
+  uint32_t psnr_measurements = 0;
   uint32_t frames_sent = 0;
 
   uint32_t huge_frames_sent = 0;

third_party/libwebrtc/media/engine/webrtc_video_engine.cc

@@ -2537,6 +2537,8 @@ WebRtcVideoSendChannel::WebRtcVideoSendStream::GetPerLayerVideoSenderInfos(
       info.report_block_datas.push_back(*stream_stats.report_block_data);
     }
     info.qp_sum = stream_stats.qp_sum;
+    info.psnr_sum = stream_stats.psnr_sum;
+    info.psnr_measurements = stream_stats.psnr_measurements;
     info.total_encode_time_ms = stream_stats.total_encode_time_ms;
     info.total_encoded_bytes_target = stream_stats.total_encoded_bytes_target;
     info.huge_frames_sent = stream_stats.huge_frames_sent;
@@ -2589,6 +2591,12 @@ WebRtcVideoSendChannel::WebRtcVideoSendStream::GetAggregatedVideoSenderInfo(
       }
       info.qp_sum = *info.qp_sum + *infos[i].qp_sum;
     }
+    if (infos[i].psnr_measurements > 0) {
+      info.psnr_measurements += infos[i].psnr_measurements;
+      info.psnr_sum.y += infos[i].psnr_sum.y;
+      info.psnr_sum.u += infos[i].psnr_sum.u;
+      info.psnr_sum.v += infos[i].psnr_sum.v;
+    }
     info.frames_encoded += infos[i].frames_encoded;
     info.frames_sent += infos[i].frames_sent;
     info.total_encode_time_ms += infos[i].total_encode_time_ms;

third_party/libwebrtc/modules/video_coding/BUILD.gn

@@ -388,6 +388,18 @@ if (rtc_use_h264 && rtc_system_openh264) {
   }
 }
 
+rtc_library("frame_sampler") {
+  visibility = [ "*" ]
+  sources = [
+    "utility/frame_sampler.cc",
+    "utility/frame_sampler.h",
+  ]
+  deps = [
+    "..:module_api_public",
+    "../../api/video:video_frame",
+  ]
+}
+
 rtc_library("video_coding_utility") {
   visibility = [ "*" ]
   sources = [
@@ -488,6 +500,7 @@ rtc_library("webrtc_h264") {
   defines = []
   deps = [
     ":codec_globals_headers",
+    ":frame_sampler",
     ":video_codec_interface",
     ":video_coding_utility",
     "../../api:scoped_refptr",
@@ -514,6 +527,7 @@ rtc_library("webrtc_h264") {
     "../../rtc_base:timeutils",
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers:metrics",
+    "../rtp_rtcp:rtp_rtcp_format",
     "svc:scalability_structures",
     "svc:scalable_video_controller",
     "//third_party/abseil-cpp/absl/base:nullability",
@@ -556,6 +570,9 @@ rtc_library("mock_libvpx_interface") {
     ":webrtc_libvpx_interface",
     "../../test:test_support",
   ]
+  if (rtc_build_libvpx) {
+    deps += [ rtc_libvpx_dir ]
+  }
 }
 
 # This target includes the internal SW codec.
@@ -572,6 +589,7 @@ rtc_library("webrtc_vp8") {
 
   deps = [
     ":codec_globals_headers",
+    ":frame_sampler",
     ":video_codec_interface",
     ":video_coding_utility",
     ":webrtc_libvpx_interface",
@@ -605,6 +623,7 @@ rtc_library("webrtc_vp8") {
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/experiments:rate_control_settings",
     "../../system_wrappers:metrics",
+    "../rtp_rtcp:rtp_rtcp_format",
     "svc:scalability_mode_util",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/base:nullability",
@@ -698,6 +717,7 @@ rtc_library("webrtc_vp9") {
 
   deps = [
     ":codec_globals_headers",
+    ":frame_sampler",
     ":video_codec_interface",
     ":video_coding_utility",
     ":webrtc_libvpx_interface",
@@ -759,7 +779,7 @@ if (rtc_include_tests) {
 
       deps = [
         "../../api/video_codecs:video_codecs_api",
-        "../../modules/utility:utility",
+        "../../modules/utility",
         "../../rtc_base:checks",
         "../../sdk/android:internal_jni",
         "../../sdk/android:native_api_base",
@@ -866,7 +886,7 @@ if (rtc_include_tests) {
       "../../api:videocodec_test_stats_api",
       "../../api/environment",
       "../../api/environment:environment_factory",
-      "../../api/numerics:numerics",
+      "../../api/numerics",
       "../../api/task_queue",
       "../../api/task_queue:default_task_queue_factory",
       "../../api/test/metrics:global_metrics_logger_and_exporter",
@@ -1206,6 +1226,7 @@ if (rtc_include_tests) {
       "utility/corruption_detection_settings_generator_unittest.cc",
       "utility/decoded_frames_history_unittest.cc",
       "utility/frame_dropper_unittest.cc",
+      "utility/frame_sampler_unittest.cc",
       "utility/framerate_controller_deprecated_unittest.cc",
       "utility/ivf_file_reader_unittest.cc",
       "utility/ivf_file_writer_unittest.cc",
@@ -1230,6 +1251,7 @@ if (rtc_include_tests) {
       ":encoded_frame",
       ":frame_dependencies_calculator",
       ":frame_helpers",
+      ":frame_sampler",
       ":h264_sprop_parameter_sets",
       ":h26x_packet_buffer",
       ":nack_requester",
@@ -1326,8 +1348,8 @@ if (rtc_include_tests) {
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
-      "../../test/time_controller:time_controller",
-      "../../third_party/libyuv:libyuv",
+      "../../test/time_controller",
+      "../../third_party/libyuv",
       "../../video/config:encoder_config",
       "../rtp_rtcp",
       "../rtp_rtcp:rtp_rtcp_format",

third_party/libwebrtc/modules/video_coding/codecs/av1/BUILD.gn

@@ -31,8 +31,10 @@ rtc_library("av1_svc_config") {
 rtc_library("dav1d_decoder") {
   visibility = [ "*" ]
   poisonous = [ "software_video_codecs" ]
-  public = [ "dav1d_decoder.h" ]
-  sources = [ "dav1d_decoder.cc" ]
+  sources = [
+    "dav1d_decoder.cc",
+    "dav1d_decoder.h",
+  ]
 
   deps = [
     "../..:video_codec_interface",
@@ -52,10 +54,14 @@ rtc_library("dav1d_decoder") {
 rtc_library("libaom_av1_encoder") {
   visibility = [ "*" ]
   poisonous = [ "software_video_codecs" ]
-  public = [ "libaom_av1_encoder.h" ]
-  sources = [ "libaom_av1_encoder.cc" ]
+  sources = [
+    "libaom_av1_encoder.cc",
+    "libaom_av1_encoder.h",
+  ]
   deps = [
     "../..:video_codec_interface",
+    "../..:video_coding_utility",
+    "../../:frame_sampler",
     "../../../../api:field_trials_view",
     "../../../../api:scoped_refptr",
     "../../../../api/environment",
@@ -114,7 +120,6 @@ if (rtc_include_tests) {
       "../../../../api/video_codecs:video_codecs_api",
       "../../../../rtc_base:checks",
       "../../../../test:create_test_field_trials",
-      "../../../../test:explicit_key_value_config",
       "../../../../test:test_support",
     ]
 
@@ -133,7 +138,6 @@ if (rtc_include_tests) {
         "../../../../api/units:time_delta",
         "../../../../modules/rtp_rtcp:rtp_rtcp_format",
         "../../../../test:fileutils",
-        "../../../../test:scoped_key_value_config",
         "../../../../test:video_test_support",
         "../../svc:scalability_mode_util",
         "../../svc:scalability_structures",