BASELINE: Update Chromium to 106.0.5249.126

Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

12 files changed, 19 insertions, 57 deletions

diff --git a/chromium/third_party/ffmpeg/libswresample/audioconvert.c b/chromium/third_party/ffmpeg/libswresample/audioconvert.c
index 500aa0e5c57..1d75ba14953 100644
--- a/chromium/third_party/ffmpeg/libswresample/audioconvert.c
+++ b/chromium/third_party/ffmpeg/libswresample/audioconvert.c
@@ -176,9 +176,13 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
         }
     }
 
-    if(HAVE_X86ASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);
-    if(ARCH_ARM)              swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels);
-    if(ARCH_AARCH64)          swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels);
+#if ARCH_X86 && HAVE_X86ASM && HAVE_MMX
+    swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);
+#elif ARCH_ARM
+    swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels);
+#elif ARCH_AARCH64
+    swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels);
+#endif
 
     return ctx;
 }
diff --git a/chromium/third_party/ffmpeg/libswresample/noise_shaping_data.c b/chromium/third_party/ffmpeg/libswresample/noise_shaping_data.c
index 77e0f2eafce..5fd2136986e 100644
--- a/chromium/third_party/ffmpeg/libswresample/noise_shaping_data.c
+++ b/chromium/third_party/ffmpeg/libswresample/noise_shaping_data.c
@@ -31,10 +31,6 @@ static double const mew44[] = {
   1.662, -1.263, .4827, -.2913, .1268, -.1124, .03252, -.01265, -.03524};
 static double const iew44[] = {
   2.847, -4.685, 6.214, -7.184, 6.639, -5.032, 3.263, -1.632, .4191};
-static double const ges44[] = {
-  2.2061, -.4706, -.2534, -.6214, 1.0587, .0676, -.6054, -.2738};
-static double const ges48[] = {
-  2.2374, -.7339, -.1251, -.6033, .903, .0116, -.5853, -.2571};
 
 static double const shi48[] = {
   2.8720729351043701172,  -5.0413231849670410156,   6.2442994117736816406,
diff --git a/chromium/third_party/ffmpeg/libswresample/rematrix.c b/chromium/third_party/ffmpeg/libswresample/rematrix.c
index 5e89b878dd6..fe823dc575e 100644
--- a/chromium/third_party/ffmpeg/libswresample/rematrix.c
+++ b/chromium/third_party/ffmpeg/libswresample/rematrix.c
@@ -565,8 +565,9 @@ av_cold int swri_rematrix_init(SwrContext *s){
         s->matrix_ch[i][0]= ch_in;
     }
 
-    if(HAVE_X86ASM && HAVE_MMX)
-        return swri_rematrix_init_x86(s);
+#if ARCH_X86 && HAVE_X86ASM && HAVE_MMX
+    return swri_rematrix_init_x86(s);
+#endif
 
     return 0;
 }
diff --git a/chromium/third_party/ffmpeg/libswresample/resample.c b/chromium/third_party/ffmpeg/libswresample/resample.c
index f1ec77f54bf..8f9efc3f219 100644
--- a/chromium/third_party/ffmpeg/libswresample/resample.c
+++ b/chromium/third_party/ffmpeg/libswresample/resample.c
@@ -452,9 +452,6 @@ static int set_compensation(ResampleContext *c, int sample_delta, int compensati
 
 static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){
     int i;
-    int av_unused mm_flags = av_get_cpu_flags();
-    int need_emms = c->format == AV_SAMPLE_FMT_S16P && ARCH_X86_32 &&
-                    (mm_flags & (AV_CPU_FLAG_MMX2 | AV_CPU_FLAG_SSE2)) == AV_CPU_FLAG_MMX2;
     int64_t max_src_size = (INT64_MAX/2 / c->phase_count) / c->src_incr;
 
     if (c->compensation_distance)
@@ -500,9 +497,6 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
         }
     }
 
-    if(need_emms)
-        emms_c();
-
     if (c->compensation_distance) {
         c->compensation_distance -= dst_size;
         if (!c->compensation_distance) {
diff --git a/chromium/third_party/ffmpeg/libswresample/resample_dsp.c b/chromium/third_party/ffmpeg/libswresample/resample_dsp.c
index b2424eb6f7c..611f44373f5 100644
--- a/chromium/third_party/ffmpeg/libswresample/resample_dsp.c
+++ b/chromium/third_party/ffmpeg/libswresample/resample_dsp.c
@@ -68,7 +68,11 @@ void swri_resample_dsp_init(ResampleContext *c)
         break;
     }
 
-    if (ARCH_X86) swri_resample_dsp_x86_init(c);
-    else if (ARCH_ARM) swri_resample_dsp_arm_init(c);
-    else if (ARCH_AARCH64) swri_resample_dsp_aarch64_init(c);
+#if ARCH_X86
+    swri_resample_dsp_x86_init(c);
+#elif ARCH_ARM
+    swri_resample_dsp_arm_init(c);
+#elif ARCH_AARCH64
+    swri_resample_dsp_aarch64_init(c);
+#endif
 }
diff --git a/chromium/third_party/ffmpeg/libswresample/version.h b/chromium/third_party/ffmpeg/libswresample/version.h
index 334b6681e2a..66bac2fa9bd 100644
--- a/chromium/third_party/ffmpeg/libswresample/version.h
+++ b/chromium/third_party/ffmpeg/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #include "version_major.h"
 
-#define LIBSWRESAMPLE_VERSION_MINOR   6
+#define LIBSWRESAMPLE_VERSION_MINOR   8
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/audio_convert.asm b/chromium/third_party/ffmpeg/libswresample/x86/audio_convert.asm
index d441636d3c4..d6d6a814957 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/audio_convert.asm
+++ b/chromium/third_party/ffmpeg/libswresample/x86/audio_convert.asm
@@ -608,15 +608,6 @@ pack_8ch_%2_to_%1_u_int %+ SUFFIX:
 %macro NOP_N 0-6
 %endmacro
 
-INIT_MMX mmx
-CONV int32, int16, u, 2, 1, INT16_TO_INT32_N, NOP_N
-CONV int32, int16, a, 2, 1, INT16_TO_INT32_N, NOP_N
-CONV int16, int32, u, 1, 2, INT32_TO_INT16_N, NOP_N
-CONV int16, int32, a, 1, 2, INT32_TO_INT16_N, NOP_N
-
-PACK_6CH float, float, u, 2, 2, 0, NOP_N, NOP_N
-PACK_6CH float, float, a, 2, 2, 0, NOP_N, NOP_N
-
 INIT_XMM sse
 PACK_6CH float, float, u, 2, 2, 7, NOP_N, NOP_N
 PACK_6CH float, float, a, 2, 2, 7, NOP_N, NOP_N
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/audio_convert_init.c b/chromium/third_party/ffmpeg/libswresample/x86/audio_convert_init.c
index a7d5ab89f85..f6d36f9ca64 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/audio_convert_init.c
+++ b/chromium/third_party/ffmpeg/libswresample/x86/audio_convert_init.c
@@ -26,7 +26,7 @@
 #define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len);
 #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap)
 #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap)
-#define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2)
+#define PROTO4(pre) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) PROTO3(pre, avx2)
 PROTO4(_)
 PROTO4(_pack_2ch_)
 PROTO4(_pack_6ch_)
@@ -52,15 +52,8 @@ av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac,
             ac->simd_f =  ff_int32_to_int16_a_ ## cap;\
     }
 
-MULTI_CAPS_FUNC(MMX, mmx)
 MULTI_CAPS_FUNC(SSE2, sse2)
 
-    if(EXTERNAL_MMX(mm_flags)) {
-        if(channels == 6) {
-            if(   out_fmt == AV_SAMPLE_FMT_FLT  && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P)
-                ac->simd_f =  ff_pack_6ch_float_to_float_a_mmx;
-        }
-    }
     if(EXTERNAL_SSE(mm_flags)) {
         if(channels == 6) {
             if(   out_fmt == AV_SAMPLE_FMT_FLT  && in_fmt == AV_SAMPLE_FMT_FLTP || out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S32P)
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/rematrix.asm b/chromium/third_party/ffmpeg/libswresample/x86/rematrix.asm
index 7984b9a729b..968010701e8 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/rematrix.asm
+++ b/chromium/third_party/ffmpeg/libswresample/x86/rematrix.asm
@@ -223,12 +223,6 @@ mix_2_1_int16_u_int %+ SUFFIX:
 %endmacro
 
 
-INIT_MMX mmx
-MIX1_INT16 u
-MIX1_INT16 a
-MIX2_INT16 u
-MIX2_INT16 a
-
 INIT_XMM sse
 MIX2_FLT u
 MIX2_FLT a
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c b/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c
index 0608c74e7f5..b6ed38bf678 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c
+++ b/chromium/third_party/ffmpeg/libswresample/x86/rematrix_init.c
@@ -28,7 +28,6 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd;
 
 D(float, sse)
 D(float, avx)
-D(int16, mmx)
 D(int16, sse2)
 
 av_cold int swri_rematrix_init_x86(struct SwrContext *s){
@@ -43,10 +42,6 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){
     s->mix_2_1_simd = NULL;
 
     if (s->midbuf.fmt == AV_SAMPLE_FMT_S16P){
-        if(EXTERNAL_MMX(mm_flags)) {
-            s->mix_1_1_simd = ff_mix_1_1_a_int16_mmx;
-            s->mix_2_1_simd = ff_mix_2_1_a_int16_mmx;
-        }
         if(EXTERNAL_SSE2(mm_flags)) {
             s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2;
             s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2;
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/resample.asm b/chromium/third_party/ffmpeg/libswresample/x86/resample.asm
index 7107cf9d42a..6c3dc28703b 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/resample.asm
+++ b/chromium/third_party/ffmpeg/libswresample/x86/resample.asm
@@ -594,11 +594,6 @@ INIT_XMM fma4
 RESAMPLE_FNS float, 4, 2, s, pf_1
 %endif
 
-%if ARCH_X86_32
-INIT_MMX mmxext
-RESAMPLE_FNS int16, 2, 1
-%endif
-
 INIT_XMM sse2
 RESAMPLE_FNS int16, 2, 1
 %if HAVE_XOP_EXTERNAL
diff --git a/chromium/third_party/ffmpeg/libswresample/x86/resample_init.c b/chromium/third_party/ffmpeg/libswresample/x86/resample_init.c
index 32c080ea4ce..d13ccd4833c 100644
--- a/chromium/third_party/ffmpeg/libswresample/x86/resample_init.c
+++ b/chromium/third_party/ffmpeg/libswresample/x86/resample_init.c
@@ -35,7 +35,6 @@ int ff_resample_common_##type##_##opt(ResampleContext *c, void *dst, \
 int ff_resample_linear_##type##_##opt(ResampleContext *c, void *dst, \
                                       const void *src, int sz, int upd)
 
-RESAMPLE_FUNCS(int16,  mmxext);
 RESAMPLE_FUNCS(int16,  sse2);
 RESAMPLE_FUNCS(int16,  xop);
 RESAMPLE_FUNCS(float,  sse);
@@ -52,10 +51,6 @@ av_cold void swri_resample_dsp_x86_init(ResampleContext *c)
 
     switch(c->format){
     case AV_SAMPLE_FMT_S16P:
-        if (ARCH_X86_32 && EXTERNAL_MMXEXT(mm_flags)) {
-            c->dsp.resample_linear = ff_resample_linear_int16_mmxext;
-            c->dsp.resample_common = ff_resample_common_int16_mmxext;
-        }
         if (EXTERNAL_SSE2(mm_flags)) {
             c->dsp.resample_linear = ff_resample_linear_int16_sse2;
             c->dsp.resample_common = ff_resample_common_int16_sse2;