From 68e783934603fce75f2509f571678d8b29e92a5e Mon Sep 17 00:00:00 2001
From: Updatebot <updatebot@mozilla.com>
Date: Fri, 11 Sep 2026 00:29:21 +0000
Subject: [PATCH] Bug 2070896 - Apply mozilla patches for libvpx r=chunmin

Differential Revision: https://phabricator.services.mozilla.com/D324948
---
 media/libvpx/libvpx/vp8/vp8_cx_iface.c        | 17 +++++++++++----
 media/libvpx/libvpx/vp9/vp9_cx_iface.c        | 21 +++++++++++++------
 .../libvpx/vpx_ports/aarch64_cpudetect.c      |  4 ++--
 media/libvpx/libvpx/vpx_util/vpx_pthread.h    |  1 +
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/media/libvpx/libvpx/vp8/vp8_cx_iface.c b/media/libvpx/libvpx/vp8/vp8_cx_iface.c
index 19754fcf5c25..524b1bbf767d 100644
--- a/media/libvpx/libvpx/vp8/vp8_cx_iface.c
+++ b/media/libvpx/libvpx/vp8/vp8_cx_iface.c
@@ -1049,10 +1049,19 @@ static vpx_codec_err_t vp8e_encode(vpx_codec_alg_priv_t *ctx,
 
       res = image2yuvconfig(img, &sd);
 
-      if (vp8_receive_raw_frame(ctx->cpi, ctx->next_frame_flag | lib_flags, &sd,
-                                dst_time_stamp, dst_end_time_stamp)) {
-        VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
-        res = update_error_state(ctx, &cpi->common.error);
+      if (sd.y_width != ctx->cfg.g_w || sd.y_height != ctx->cfg.g_h) {
+        /* from vpx_encoder.h for g_w/g_h:
+           "Note that the frames passed as input to the encoder must have this
+           resolution"
+        */
+        ctx->base.err_detail = "Invalid input frame resolution";
+        res = VPX_CODEC_INVALID_PARAM;
+      } else {
+        if (vp8_receive_raw_frame(ctx->cpi, ctx->next_frame_flag | lib_flags,
+                                  &sd, dst_time_stamp, dst_end_time_stamp)) {
+          VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
+          res = update_error_state(ctx, &cpi->common.error);
+        }
       }
 
       /* reset for next frame */
diff --git a/media/libvpx/libvpx/vp9/vp9_cx_iface.c b/media/libvpx/libvpx/vp9/vp9_cx_iface.c
index 47603e17e615..f80a6e5b8179 100644
--- a/media/libvpx/libvpx/vp9/vp9_cx_iface.c
+++ b/media/libvpx/libvpx/vp9/vp9_cx_iface.c
@@ -1554,13 +1554,22 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx,
         timebase_units_to_ticks(timebase_in_ts, pts_end);
     res = image2yuvconfig(img, &sd);
 
-    // Store the original flags in to the frame buffer. Will extract the
-    // key frame flag when we actually encode this frame.
-    if (vp9_receive_raw_frame(cpi, flags | ctx->next_frame_flags, &sd,
-                              dst_time_stamp, dst_end_time_stamp)) {
-      res = update_error_state(ctx, &cpi->common.error);
+    if (sd.y_width != ctx->cfg.g_w || sd.y_height != ctx->cfg.g_h) {
+      /* from vpx_encoder.h for g_w/g_h:
+         "Note that the frames passed as input to the encoder must have this
+         resolution"
+      */
+      ctx->base.err_detail = "Invalid input frame resolution";
+      res = VPX_CODEC_INVALID_PARAM;
+    } else {
+      // Store the original flags in to the frame buffer. Will extract the
+      // key frame flag when we actually encode this frame.
+      if (vp9_receive_raw_frame(cpi, flags | ctx->next_frame_flags, &sd,
+                                dst_time_stamp, dst_end_time_stamp)) {
+        res = update_error_state(ctx, &cpi->common.error);
+      }
+      ctx->next_frame_flags = 0;
     }
-    ctx->next_frame_flags = 0;
   }
 
   cx_data = ctx->cx_data;
diff --git a/media/libvpx/libvpx/vpx_ports/aarch64_cpudetect.c b/media/libvpx/libvpx/vpx_ports/aarch64_cpudetect.c
index df8e1e244d69..d69e8e757bbb 100644
--- a/media/libvpx/libvpx/vpx_ports/aarch64_cpudetect.c
+++ b/media/libvpx/libvpx/vpx_ports/aarch64_cpudetect.c
@@ -16,7 +16,7 @@
 #include <sys/sysctl.h>
 #endif
 
-#if !CONFIG_RUNTIME_CPU_DETECT
+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
 
 static int arm_get_cpu_caps(void) {
   // This function should actually be a no-op. There is no way to adjust any of
@@ -29,7 +29,7 @@ static int arm_get_cpu_caps(void) {
   return flags;
 }
 
-#elif defined(__APPLE__)  // end !CONFIG_RUNTIME_CPU_DETECT
+#elif defined(__APPLE__)  // end !CONFIG_RUNTIME_CPU_DETECT || defined(__OpenBSD__)
 
 // sysctlbyname() parameter documentation for instruction set characteristics:
 // https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
diff --git a/media/libvpx/libvpx/vpx_util/vpx_pthread.h b/media/libvpx/libvpx/vpx_util/vpx_pthread.h
index 8bb94df73fab..1e8adf2e2fac 100644
--- a/media/libvpx/libvpx/vpx_util/vpx_pthread.h
+++ b/media/libvpx/libvpx/vpx_util/vpx_pthread.h
@@ -26,6 +26,7 @@ extern "C" {
 #define NOMINMAX
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#include <errno.h>    // NOLINT
 #include <process.h>  // NOLINT
 #include <stddef.h>   // NOLINT
 #include <windows.h>  // NOLINT