diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-29 16:16:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 10:04:06 +0000 |
| commit | a95a7417ad456115a1ef2da4bb8320531c0821f1 (patch) | |
| tree | edcd59279e486d2fd4a8f88a7ed025bcf925c6e6 /chromium/third_party/ffmpeg/ffmpeg_generated.gni | |
| parent | 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (diff) | |
| download | qtwebengine-chromium-a95a7417ad456115a1ef2da4bb8320531c0821f1.tar.gz | |
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>
Diffstat (limited to 'chromium/third_party/ffmpeg/ffmpeg_generated.gni')
| -rw-r--r-- | chromium/third_party/ffmpeg/ffmpeg_generated.gni | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/chromium/third_party/ffmpeg/ffmpeg_generated.gni b/chromium/third_party/ffmpeg/ffmpeg_generated.gni index b2a99969d86..b8e65c5ee99 100644 --- a/chromium/third_party/ffmpeg/ffmpeg_generated.gni +++ b/chromium/third_party/ffmpeg/ffmpeg_generated.gni @@ -160,6 +160,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && curre "libavutil/channel_layout.c", "libavutil/color_utils.c", "libavutil/crc.c", + "libavutil/csp.c", "libavutil/detection_bbox.c", "libavutil/dict.c", "libavutil/display.c", @@ -205,6 +206,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && curre "libavutil/tx.c", "libavutil/tx_double.c", "libavutil/tx_int32.c", + "libavutil/uuid.c", "libavutil/video_enc_params.c", ] } @@ -554,6 +556,20 @@ if (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding ] } +if (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") { + ffmpeg_c_sources += [ + "libavcodec/aarch64/idctdsp_init_aarch64.c", + "libavcodec/aarch64/me_cmp_init_aarch64.c", + "libavcodec/aarch64/pixblockdsp_init_aarch64.c", + ] + ffmpeg_gas_sources += [ + "libavcodec/aarch64/idctdsp_neon.S", + "libavcodec/aarch64/me_cmp_neon.S", + "libavcodec/aarch64/pixblockdsp_neon.S", + "libavcodec/aarch64/simple_idct_neon.S", + ] +} + if ((is_android && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon)) { ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c", @@ -580,18 +596,6 @@ if (use_linux_config && current_cpu == "arm" && arm_use_neon) { ] } -if (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") { - ffmpeg_c_sources += [ - "libavcodec/aarch64/idctdsp_init_aarch64.c", - "libavcodec/aarch64/pixblockdsp_init_aarch64.c", - ] - ffmpeg_gas_sources += [ - "libavcodec/aarch64/idctdsp_neon.S", - "libavcodec/aarch64/pixblockdsp_neon.S", - "libavcodec/aarch64/simple_idct_neon.S", - ] -} - if ((use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", @@ -653,6 +657,12 @@ if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "C ] } +if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win && current_cpu == "arm64") || (is_win && current_cpu == "x86") || (use_linux_config)) { + ffmpeg_c_sources += [ + "libavutil/hwcontext_stub.c", + ] +} + if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86")) { ffmpeg_c_sources += [ "compat/strtod.c", |