From c58ba0eae010de6efe82e6d184265b23ff2ec2cf Mon Sep 17 00:00:00 2001 From: Sta Zhu Date: Sat, 30 Jul 2022 22:46:45 +0800 Subject: [PATCH] Video: Add HEVC ffmpeg decoder & parser Add ffmpeg software decoder and parser for HEVC, this will make sure those users using macOS version < 11 or Windows < 8 or those users who disabled gpu acceleration or hardware not supported profiles to have software HEVC decoding ability. --- .../config/Chrome/linux/arm-neon/config.h | 8 ++--- .../Chrome/linux/arm-neon/config_components.h | 4 +-- .../linux/arm-neon/libavcodec/codec_list.c | 1 + .../linux/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/arm/config.h | 8 ++--- .../Chrome/linux/arm/config_components.h | 4 +-- .../Chrome/linux/arm/libavcodec/codec_list.c | 1 + .../Chrome/linux/arm/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/arm64/config.h | 8 ++--- .../Chrome/linux/arm64/config_components.h | 4 +-- .../linux/arm64/libavcodec/codec_list.c | 1 + .../linux/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/ia32/config.h | 8 ++--- .../Chrome/linux/ia32/config_components.h | 4 +-- .../Chrome/linux/ia32/libavcodec/codec_list.c | 1 + .../linux/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chrome/linux/x64/config.h | 8 ++--- .../Chrome/linux/x64/config_components.h | 4 +-- .../Chrome/linux/x64/libavcodec/codec_list.c | 1 + .../Chrome/linux/x64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/mac/arm64/config.h | 8 ++--- .../Chrome/mac/arm64/config_components.h | 4 +-- .../Chrome/mac/arm64/libavcodec/codec_list.c | 1 + .../Chrome/mac/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/mac/x64/config.asm | 6 ++-- chromium/config/Chrome/mac/x64/config.h | 8 ++--- .../config/Chrome/mac/x64/config_components.h | 4 +-- .../Chrome/mac/x64/libavcodec/codec_list.c | 1 + .../Chrome/mac/x64/libavcodec/parser_list.c | 1 + .../config/Chrome/win-msvc/ia32/config.asm | 8 ++--- chromium/config/Chrome/win-msvc/ia32/config.h | 10 +++--- .../win-msvc/ia32/libavcodec/codec_list.c | 1 + .../win-msvc/ia32/libavcodec/parser_list.c | 1 + .../config/Chrome/win-msvc/x64/config.asm | 8 ++--- chromium/config/Chrome/win-msvc/x64/config.h | 10 +++--- .../win-msvc/x64/libavcodec/codec_list.c | 1 + .../win-msvc/x64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/arm64/config.h | 8 ++--- .../Chrome/win/arm64/config_components.h | 4 +-- .../Chrome/win/arm64/libavcodec/codec_list.c | 1 + .../Chrome/win/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/ia32/config.asm | 6 ++-- chromium/config/Chrome/win/ia32/config.h | 8 ++--- .../Chrome/win/ia32/config_components.h | 4 +-- .../Chrome/win/ia32/libavcodec/codec_list.c | 1 + .../Chrome/win/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chrome/win/x64/config.asm | 6 ++-- chromium/config/Chrome/win/x64/config.h | 8 ++--- .../config/Chrome/win/x64/config_components.h | 4 +-- .../Chrome/win/x64/libavcodec/codec_list.c | 1 + .../Chrome/win/x64/libavcodec/parser_list.c | 1 + .../config/ChromeOS/linux-noasm/x64/config.h | 8 ++--- .../linux-noasm/x64/config_components.h | 4 +-- .../linux-noasm/x64/libavcodec/codec_list.c | 1 + .../linux-noasm/x64/libavcodec/parser_list.c | 1 + .../config/ChromeOS/linux/arm-neon/config.h | 8 ++--- .../linux/arm-neon/config_components.h | 4 +-- .../linux/arm-neon/libavcodec/codec_list.c | 1 + .../linux/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/ChromeOS/linux/arm/config.h | 8 ++--- .../ChromeOS/linux/arm/config_components.h | 4 +-- .../linux/arm/libavcodec/codec_list.c | 1 + .../linux/arm/libavcodec/parser_list.c | 1 + chromium/config/ChromeOS/linux/arm64/config.h | 8 ++--- .../ChromeOS/linux/arm64/config_components.h | 4 +-- .../linux/arm64/libavcodec/codec_list.c | 1 + .../linux/arm64/libavcodec/parser_list.c | 1 + chromium/config/ChromeOS/linux/ia32/config.h | 8 ++--- .../ChromeOS/linux/ia32/config_components.h | 4 +-- .../linux/ia32/libavcodec/codec_list.c | 1 + .../linux/ia32/libavcodec/parser_list.c | 1 + chromium/config/ChromeOS/linux/x64/config.h | 8 ++--- .../ChromeOS/linux/x64/config_components.h | 4 +-- .../linux/x64/libavcodec/codec_list.c | 1 + .../linux/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/linux-noasm/x64/config.h | 6 ++-- .../linux-noasm/x64/config_components.h | 4 +-- .../linux-noasm/x64/libavcodec/codec_list.c | 1 + .../linux-noasm/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/linux/arm-neon/config.h | 6 ++-- .../linux/arm-neon/config_components.h | 4 +-- .../linux/arm-neon/libavcodec/codec_list.c | 1 + .../linux/arm-neon/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/arm/config.h | 6 ++-- .../Chromium/linux/arm/config_components.h | 4 +-- .../linux/arm/libavcodec/codec_list.c | 1 + .../linux/arm/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/arm64/config.h | 6 ++-- .../Chromium/linux/arm64/config_components.h | 4 +-- .../linux/arm64/libavcodec/codec_list.c | 1 + .../linux/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/ia32/config.h | 6 ++-- .../Chromium/linux/ia32/config_components.h | 4 +-- .../linux/ia32/libavcodec/codec_list.c | 1 + .../linux/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chromium/linux/x64/config.h | 6 ++-- .../Chromium/linux/x64/config_components.h | 4 +-- .../linux/x64/libavcodec/codec_list.c | 1 + .../linux/x64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/mac/arm64/config.h | 6 ++-- .../Chromium/mac/arm64/config_components.h | 4 +-- .../mac/arm64/libavcodec/codec_list.c | 1 + .../mac/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/mac/x64/config.asm | 6 ++-- chromium/config/Chromium/mac/x64/config.h | 6 ++-- .../Chromium/mac/x64/config_components.h | 4 +-- .../Chromium/mac/x64/libavcodec/codec_list.c | 1 + .../Chromium/mac/x64/libavcodec/parser_list.c | 1 + .../config/Chromium/win-msvc/ia32/config.asm | 8 ++--- .../config/Chromium/win-msvc/ia32/config.h | 8 ++--- .../win-msvc/ia32/libavcodec/codec_list.c | 1 + .../win-msvc/ia32/libavcodec/parser_list.c | 1 + .../config/Chromium/win-msvc/x64/config.asm | 8 ++--- .../config/Chromium/win-msvc/x64/config.h | 8 ++--- .../win-msvc/x64/libavcodec/codec_list.c | 1 + .../win-msvc/x64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/arm64/config.h | 6 ++-- .../Chromium/win/arm64/config_components.h | 4 +-- .../win/arm64/libavcodec/codec_list.c | 1 + .../win/arm64/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/ia32/config.asm | 6 ++-- chromium/config/Chromium/win/ia32/config.h | 6 ++-- .../Chromium/win/ia32/config_components.h | 4 +-- .../Chromium/win/ia32/libavcodec/codec_list.c | 1 + .../win/ia32/libavcodec/parser_list.c | 1 + chromium/config/Chromium/win/x64/config.asm | 6 ++-- chromium/config/Chromium/win/x64/config.h | 6 ++-- .../Chromium/win/x64/config_components.h | 4 +-- .../Chromium/win/x64/libavcodec/codec_list.c | 1 + .../Chromium/win/x64/libavcodec/parser_list.c | 1 + chromium/scripts/build_ffmpeg.py | 4 +-- ffmpeg_generated.gni | 36 +++++++++++++++++++ ...ame_libavcodec_aarch64_hevcdsp_idct_neon.S | 2 ++ ...name_libavcodec_aarch64_hevcdsp_sao_neon.S | 2 ++ libavcodec/autorename_libavcodec_bswapdsp.c | 2 ++ 135 files changed, 309 insertions(+), 205 deletions(-) create mode 100644 libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S create mode 100644 libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S create mode 100644 libavcodec/autorename_libavcodec_bswapdsp.c diff --git a/chromium/config/Chrome/linux/arm-neon/config.h b/chromium/config/Chrome/linux/arm-neon/config.h index a72e408846..7ec348efd5 100644 --- a/chromium/config/Chrome/linux/arm-neon/config.h +++ b/chromium/config/Chrome/linux/arm-neon/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm-neon/config_components.h b/chromium/config/Chrome/linux/arm-neon/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/linux/arm-neon/config_components.h +++ b/chromium/config/Chrome/linux/arm-neon/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm-neon/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm-neon/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm/config.h b/chromium/config/Chrome/linux/arm/config.h index 6ef3419f1b..0079613b58 100644 --- a/chromium/config/Chrome/linux/arm/config.h +++ b/chromium/config/Chrome/linux/arm/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm/config_components.h b/chromium/config/Chrome/linux/arm/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/linux/arm/config_components.h +++ b/chromium/config/Chrome/linux/arm/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/arm64/config.h b/chromium/config/Chrome/linux/arm64/config.h index b93e09453c..4e2d5f4e9f 100644 --- a/chromium/config/Chrome/linux/arm64/config.h +++ b/chromium/config/Chrome/linux/arm64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/arm64/config_components.h b/chromium/config/Chrome/linux/arm64/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/linux/arm64/config_components.h +++ b/chromium/config/Chrome/linux/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/arm64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/arm64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/ia32/config.h b/chromium/config/Chrome/linux/ia32/config.h index 361204b5d7..510025a431 100644 --- a/chromium/config/Chrome/linux/ia32/config.h +++ b/chromium/config/Chrome/linux/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/ia32/config_components.h b/chromium/config/Chrome/linux/ia32/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/linux/ia32/config_components.h +++ b/chromium/config/Chrome/linux/ia32/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/ia32/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/ia32/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h index b7825160cd..b42f083cf0 100644 --- a/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/linux/x64/config_components.h b/chromium/config/Chrome/linux/x64/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/linux/x64/config_components.h +++ b/chromium/config/Chrome/linux/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/mac/arm64/config.h b/chromium/config/Chrome/mac/arm64/config.h index 08a34c1b95..56d794a30b 100644 --- a/chromium/config/Chrome/mac/arm64/config.h +++ b/chromium/config/Chrome/mac/arm64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/arm64/config_components.h b/chromium/config/Chrome/mac/arm64/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/mac/arm64/config_components.h +++ b/chromium/config/Chrome/mac/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/mac/arm64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/mac/arm64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/mac/x64/config.asm b/chromium/config/Chrome/mac/x64/config.asm index 81eeb9689a..a5878d07fe 100644 --- a/chromium/config/Chrome/mac/x64/config.asm +++ b/chromium/config/Chrome/mac/x64/config.asm @@ -634,7 +634,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -646,7 +646,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -664,7 +664,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/x64/config.h b/chromium/config/Chrome/mac/x64/config.h index 779b5348ea..a9eb138a42 100644 --- a/chromium/config/Chrome/mac/x64/config.h +++ b/chromium/config/Chrome/mac/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/15.0.0/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/mac/x64/config_components.h b/chromium/config/Chrome/mac/x64/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/mac/x64/config_components.h +++ b/chromium/config/Chrome/mac/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c b/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win-msvc/ia32/config.asm b/chromium/config/Chrome/win-msvc/ia32/config.asm index ac13ddabdd..1305cdb704 100644 --- a/chromium/config/Chrome/win-msvc/ia32/config.asm +++ b/chromium/config/Chrome/win-msvc/ia32/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 1 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/ia32/config.h b/chromium/config/Chrome/win-msvc/ia32/config.h index 90497d03b1..2877ca3f1a 100644 --- a/chromium/config/Chrome/win-msvc/ia32/config.h +++ b/chromium/config/Chrome/win-msvc/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2018 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c index 49f757b2d8..5ca1e9958c 100644 --- a/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win-msvc/ia32/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c index 19d670aa24..f55c2ca459 100644 --- a/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win-msvc/ia32/libavcodec/parser_list.c @@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win-msvc/x64/config.asm b/chromium/config/Chrome/win-msvc/x64/config.asm index 49d66ac57d..c3e7f4de28 100644 --- a/chromium/config/Chrome/win-msvc/x64/config.asm +++ b/chromium/config/Chrome/win-msvc/x64/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 1 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/x64/config.h b/chromium/config/Chrome/win-msvc/x64/config.h index 359682176a..ed9374621b 100644 --- a/chromium/config/Chrome/win-msvc/x64/config.h +++ b/chromium/config/Chrome/win-msvc/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio' --extra-cflags=-I/cygdrive/d/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=yasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/cygdrive/d/chromium/src/third_party/ffmpeg/chromium/include/win --cc='cygwin-wrapper cl' --ld='cygwin-wrapper link' --nm='cygwin-wrapper dumpbin -symbols' --ar='cygwin-wrapper lib' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2018 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c index 49f757b2d8..5ca1e9958c 100644 --- a/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win-msvc/x64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c index 19d670aa24..f55c2ca459 100644 --- a/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win-msvc/x64/libavcodec/parser_list.c @@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/arm64/config.h b/chromium/config/Chrome/win/arm64/config.h index 5ba32d05c4..f96801f29c 100644 --- a/chromium/config/Chrome/win/arm64/config.h +++ b/chromium/config/Chrome/win/arm64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --arch=aarch64 --as=clang-cl --extra-cflags='--target=arm64-windows' --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --arch=aarch64 --as=clang-cl --extra-cflags='--target=arm64-windows' --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/arm64/config_components.h b/chromium/config/Chrome/win/arm64/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/win/arm64/config_components.h +++ b/chromium/config/Chrome/win/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c b/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/arm64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c b/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/arm64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/ia32/config.asm b/chromium/config/Chrome/win/ia32/config.asm index 7ec573a360..98c7231f93 100644 --- a/chromium/config/Chrome/win/ia32/config.asm +++ b/chromium/config/Chrome/win/ia32/config.asm @@ -634,7 +634,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -646,7 +646,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -664,7 +664,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/ia32/config.h b/chromium/config/Chrome/win/ia32/config.h index 7dacba671a..408f0b4fe2 100644 --- a/chromium/config/Chrome/win/ia32/config.h +++ b/chromium/config/Chrome/win/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-m32 --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=-m32 --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/ia32/config_components.h b/chromium/config/Chrome/win/ia32/config_components.h index 3793414171..b8e167b2dd 100644 --- a/chromium/config/Chrome/win/ia32/config_components.h +++ b/chromium/config/Chrome/win/ia32/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c b/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/ia32/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c b/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/ia32/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chrome/win/x64/config.asm b/chromium/config/Chrome/win/x64/config.asm index e085147c16..b6ef104a29 100644 --- a/chromium/config/Chrome/win/x64/config.asm +++ b/chromium/config/Chrome/win/x64/config.asm @@ -632,7 +632,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 1 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -644,7 +644,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -662,7 +662,7 @@ %define CONFIG_H264PARSE 1 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 1 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h index b1f3b9ba67..e9a2778b43 100644 --- a/chromium/config/Chrome/win/x64/config.h +++ b/chromium/config/Chrome/win/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --toolchain=msvc --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/ffmpeg/chromium/include/win --target-os=win64 --enable-cross-compile --cc=clang-cl --ld=lld-link --nm=llvm-nm --ar=llvm-ar --extra-cflags=-O2 --extra-cflags=/winsysroot/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82 --extra-ldflags='/winsysroot:/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/depot_tools/win_toolchain/vs_files/1023ce2e82' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -648,7 +648,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -660,7 +660,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -678,7 +678,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h index 038070d0b3..02b4f35d1b 100644 --- a/chromium/config/Chrome/win/x64/config_components.h +++ b/chromium/config/Chrome/win/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -927,7 +927,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 #define CONFIG_MJPEG_PARSER 0 diff --git a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c index cbd7f3945a..80d0456b5c 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c @@ -17,4 +17,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c index 50acddb28e..1269282a87 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c @@ -8,4 +8,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux-noasm/x64/config.h b/chromium/config/ChromeOS/linux-noasm/x64/config.h index a976144b7c..75007b0d4d 100644 --- a/chromium/config/ChromeOS/linux-noasm/x64/config.h +++ b/chromium/config/ChromeOS/linux-noasm/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --disable-asm --disable-inline-asm --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux-noasm/x64/config_components.h b/chromium/config/ChromeOS/linux-noasm/x64/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux-noasm/x64/config_components.h +++ b/chromium/config/ChromeOS/linux-noasm/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux-noasm/x64/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm-neon/config.h b/chromium/config/ChromeOS/linux/arm-neon/config.h index 69c305d4aa..66093bc7c5 100644 --- a/chromium/config/ChromeOS/linux/arm-neon/config.h +++ b/chromium/config/ChromeOS/linux/arm-neon/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux/arm-neon/config_components.h b/chromium/config/ChromeOS/linux/arm-neon/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux/arm-neon/config_components.h +++ b/chromium/config/ChromeOS/linux/arm-neon/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux/arm-neon/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux/arm-neon/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux/arm-neon/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm-neon/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux/arm-neon/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux/arm-neon/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm/config.h b/chromium/config/ChromeOS/linux/arm/config.h index 21a82c32a0..b2c7ec887c 100644 --- a/chromium/config/ChromeOS/linux/arm/config.h +++ b/chromium/config/ChromeOS/linux/arm/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --extra-cflags='--target=arm-linux-gnueabihf' --extra-ldflags='--target=arm-linux-gnueabihf' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm-sysroot --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --extra-cflags=-O2 --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux/arm/config_components.h b/chromium/config/ChromeOS/linux/arm/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux/arm/config_components.h +++ b/chromium/config/ChromeOS/linux/arm/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux/arm/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux/arm/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux/arm/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux/arm/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux/arm/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux/arm/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux/arm/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm64/config.h b/chromium/config/ChromeOS/linux/arm64/config.h index a51096eb3c..89c7ca98a2 100644 --- a/chromium/config/ChromeOS/linux/arm64/config.h +++ b/chromium/config/ChromeOS/linux/arm64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --extra-cflags='--target=aarch64-linux-gnu' --extra-ldflags='--target=aarch64-linux-gnu' --sysroot=/usr/local/google/home/ezemtsov/projects/chromium/src/build/linux/debian_bullseye_arm64-sysroot --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux/arm64/config_components.h b/chromium/config/ChromeOS/linux/arm64/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux/arm64/config_components.h +++ b/chromium/config/ChromeOS/linux/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux/arm64/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux/arm64/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux/arm64/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux/arm64/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux/arm64/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux/arm64/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux/arm64/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux/arm64/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux/ia32/config.h b/chromium/config/ChromeOS/linux/ia32/config.h index 8bd91d1e77..61cc1e57ba 100644 --- a/chromium/config/ChromeOS/linux/ia32/config.h +++ b/chromium/config/ChromeOS/linux/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux/ia32/config_components.h b/chromium/config/ChromeOS/linux/ia32/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux/ia32/config_components.h +++ b/chromium/config/ChromeOS/linux/ia32/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux/ia32/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux/ia32/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux/ia32/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux/ia32/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux/ia32/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux/ia32/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux/ia32/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux/ia32/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/ChromeOS/linux/x64/config.h b/chromium/config/ChromeOS/linux/x64/config.h index 00ceb4f5a1..fcd4aaef6e 100644 --- a/chromium/config/ChromeOS/linux/x64/config.h +++ b/chromium/config/ChromeOS/linux/x64/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ +/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264,hevc' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=gsm_ms --enable-parser=gsm" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2022 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 1 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 1 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 1 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 1 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/ChromeOS/linux/x64/config_components.h b/chromium/config/ChromeOS/linux/x64/config_components.h index 2f72b8a72b..580030a619 100644 --- a/chromium/config/ChromeOS/linux/x64/config_components.h +++ b/chromium/config/ChromeOS/linux/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/ChromeOS/linux/x64/libavcodec/codec_list.c b/chromium/config/ChromeOS/linux/x64/libavcodec/codec_list.c index 54175cb4ac..d38580a7a3 100644 --- a/chromium/config/ChromeOS/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/ChromeOS/linux/x64/libavcodec/codec_list.c @@ -22,4 +22,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/ChromeOS/linux/x64/libavcodec/parser_list.c b/chromium/config/ChromeOS/linux/x64/libavcodec/parser_list.c index 48dcf4122e..1c76f6678d 100644 --- a/chromium/config/ChromeOS/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/ChromeOS/linux/x64/libavcodec/parser_list.c @@ -11,4 +11,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux-noasm/x64/config.h b/chromium/config/Chromium/linux-noasm/x64/config.h index 4318d2c9b1..be6430d2b4 100644 --- a/chromium/config/Chromium/linux-noasm/x64/config.h +++ b/chromium/config/Chromium/linux-noasm/x64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux-noasm/x64/config_components.h b/chromium/config/Chromium/linux-noasm/x64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux-noasm/x64/config_components.h +++ b/chromium/config/Chromium/linux-noasm/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c b/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux-noasm/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c b/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux-noasm/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm-neon/config.h b/chromium/config/Chromium/linux/arm-neon/config.h index 94a80e8657..7fb958590a 100644 --- a/chromium/config/Chromium/linux/arm-neon/config.h +++ b/chromium/config/Chromium/linux/arm-neon/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm-neon/config_components.h b/chromium/config/Chromium/linux/arm-neon/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux/arm-neon/config_components.h +++ b/chromium/config/Chromium/linux/arm-neon/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm-neon/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm-neon/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm/config.h b/chromium/config/Chromium/linux/arm/config.h index 23272adff7..2b02f1f61a 100644 --- a/chromium/config/Chromium/linux/arm/config.h +++ b/chromium/config/Chromium/linux/arm/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm/config_components.h b/chromium/config/Chromium/linux/arm/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux/arm/config_components.h +++ b/chromium/config/Chromium/linux/arm/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/arm64/config.h b/chromium/config/Chromium/linux/arm64/config.h index 3a034234d7..135be56ef8 100644 --- a/chromium/config/Chromium/linux/arm64/config.h +++ b/chromium/config/Chromium/linux/arm64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/arm64/config_components.h b/chromium/config/Chromium/linux/arm64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux/arm64/config_components.h +++ b/chromium/config/Chromium/linux/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/arm64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/ia32/config.h b/chromium/config/Chromium/linux/ia32/config.h index 1730ef289d..48f59e3e61 100644 --- a/chromium/config/Chromium/linux/ia32/config.h +++ b/chromium/config/Chromium/linux/ia32/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/ia32/config_components.h b/chromium/config/Chromium/linux/ia32/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux/ia32/config_components.h +++ b/chromium/config/Chromium/linux/ia32/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/ia32/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/ia32/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/linux/x64/config.h b/chromium/config/Chromium/linux/x64/config.h index e449ecb6df..81c3cd37c0 100644 --- a/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/config/Chromium/linux/x64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/linux/x64/config_components.h b/chromium/config/Chromium/linux/x64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/linux/x64/config_components.h +++ b/chromium/config/Chromium/linux/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c b/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/linux/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c b/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/linux/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/mac/arm64/config.h b/chromium/config/Chromium/mac/arm64/config.h index 36ea3943e2..fbf477aa55 100644 --- a/chromium/config/Chromium/mac/arm64/config.h +++ b/chromium/config/Chromium/mac/arm64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/arm64/config_components.h b/chromium/config/Chromium/mac/arm64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/mac/arm64/config_components.h +++ b/chromium/config/Chromium/mac/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/mac/arm64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/mac/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/mac/x64/config.asm b/chromium/config/Chromium/mac/x64/config.asm index f16350a225..9a57183a7a 100644 --- a/chromium/config/Chromium/mac/x64/config.asm +++ b/chromium/config/Chromium/mac/x64/config.asm @@ -634,7 +634,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -646,7 +646,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -664,7 +664,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/x64/config.h b/chromium/config/Chromium/mac/x64/config.h index c806e088f4..b2585250d8 100644 --- a/chromium/config/Chromium/mac/x64/config.h +++ b/chromium/config/Chromium/mac/x64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/mac/x64/config_components.h b/chromium/config/Chromium/mac/x64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/mac/x64/config_components.h +++ b/chromium/config/Chromium/mac/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c b/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/mac/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c b/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/mac/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win-msvc/ia32/config.asm b/chromium/config/Chromium/win-msvc/ia32/config.asm index e425512ab2..99eeb26c7f 100644 --- a/chromium/config/Chromium/win-msvc/ia32/config.asm +++ b/chromium/config/Chromium/win-msvc/ia32/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 0 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/ia32/config.h b/chromium/config/Chromium/win-msvc/ia32/config.h index a23d3a6089..b1fb82acc2 100644 --- a/chromium/config/Chromium/win-msvc/ia32/config.h +++ b/chromium/config/Chromium/win-msvc/ia32/config.h @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c index 9407bd2775..069f0f61bd 100644 --- a/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win-msvc/ia32/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c index 4c59b89cdf..8629776838 100644 --- a/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win-msvc/ia32/libavcodec/parser_list.c @@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win-msvc/x64/config.asm b/chromium/config/Chromium/win-msvc/x64/config.asm index 3c9bd63728..71c73ca09b 100644 --- a/chromium/config/Chromium/win-msvc/x64/config.asm +++ b/chromium/config/Chromium/win-msvc/x64/config.asm @@ -563,7 +563,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_H264 0 @@ -587,7 +587,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 @@ -752,7 +752,7 @@ %define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_RKMPP_DECODER 0 %define CONFIG_HAP_DECODER 0 -%define CONFIG_HEVC_DECODER 0 +%define CONFIG_HEVC_DECODER 1 %define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HEVC_RKMPP_DECODER 0 %define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1450,7 +1450,7 @@ %define CONFIG_H261_PARSER 0 %define CONFIG_H263_PARSER 0 %define CONFIG_H264_PARSER 0 -%define CONFIG_HEVC_PARSER 0 +%define CONFIG_HEVC_PARSER 1 %define CONFIG_MJPEG_PARSER 0 %define CONFIG_MLP_PARSER 0 %define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/x64/config.h b/chromium/config/Chromium/win-msvc/x64/config.h index 89d69e4734..81ff36df32 100644 --- a/chromium/config/Chromium/win-msvc/x64/config.h +++ b/chromium/config/Chromium/win-msvc/x64/config.h @@ -578,7 +578,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_H264 0 @@ -602,7 +602,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 @@ -767,7 +767,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -1465,7 +1465,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_MJPEG_PARSER 0 #define CONFIG_MLP_PARSER 0 #define CONFIG_MPEG4VIDEO_PARSER 0 diff --git a/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c b/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c index 9407bd2775..069f0f61bd 100644 --- a/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win-msvc/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const AVCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c b/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c index 4c59b89cdf..8629776838 100644 --- a/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win-msvc/x64/libavcodec/parser_list.c @@ -5,4 +5,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vorbis_parser, &ff_vp3_parser, &ff_vp8_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/arm64/config.h b/chromium/config/Chromium/win/arm64/config.h index dac33bcd6e..72f0d7f671 100644 --- a/chromium/config/Chromium/win/arm64/config.h +++ b/chromium/config/Chromium/win/arm64/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/arm64/config_components.h b/chromium/config/Chromium/win/arm64/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/win/arm64/config_components.h +++ b/chromium/config/Chromium/win/arm64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c b/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/arm64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c b/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/arm64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/ia32/config.asm b/chromium/config/Chromium/win/ia32/config.asm index eb71914881..39f710219e 100644 --- a/chromium/config/Chromium/win/ia32/config.asm +++ b/chromium/config/Chromium/win/ia32/config.asm @@ -634,7 +634,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -646,7 +646,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -664,7 +664,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/ia32/config.h b/chromium/config/Chromium/win/ia32/config.h index a21398e2aa..d5bec7b66a 100644 --- a/chromium/config/Chromium/win/ia32/config.h +++ b/chromium/config/Chromium/win/ia32/config.h @@ -650,7 +650,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -662,7 +662,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -680,7 +680,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/ia32/config_components.h b/chromium/config/Chromium/win/ia32/config_components.h index 8b44fc3bc3..51d49d897d 100644 --- a/chromium/config/Chromium/win/ia32/config_components.h +++ b/chromium/config/Chromium/win/ia32/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -932,7 +932,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_HDR_PARSER 0 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 diff --git a/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c b/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/ia32/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c b/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/ia32/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/config/Chromium/win/x64/config.asm b/chromium/config/Chromium/win/x64/config.asm index d765fcc89d..da35b2f2dc 100644 --- a/chromium/config/Chromium/win/x64/config.asm +++ b/chromium/config/Chromium/win/x64/config.asm @@ -632,7 +632,7 @@ %define CONFIG_AUDIO_FRAME_QUEUE 0 %define CONFIG_AUDIODSP 0 %define CONFIG_BLOCKDSP 0 -%define CONFIG_BSWAPDSP 0 +%define CONFIG_BSWAPDSP 1 %define CONFIG_CABAC 0 %define CONFIG_CBS 0 %define CONFIG_CBS_AV1 0 @@ -644,7 +644,7 @@ %define CONFIG_DEFLATE_WRAPPER 0 %define CONFIG_DIRAC_PARSE 1 %define CONFIG_DNN 0 -%define CONFIG_DOVI_RPU 0 +%define CONFIG_DOVI_RPU 1 %define CONFIG_DVPROFILE 0 %define CONFIG_EXIF 0 %define CONFIG_FAANDCT 0 @@ -662,7 +662,7 @@ %define CONFIG_H264PARSE 0 %define CONFIG_H264PRED 1 %define CONFIG_H264QPEL 0 -%define CONFIG_HEVCPARSE 0 +%define CONFIG_HEVCPARSE 1 %define CONFIG_HPELDSP 1 %define CONFIG_HUFFMAN 0 %define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/x64/config.h b/chromium/config/Chromium/win/x64/config.h index 4447487a06..51ab2ca756 100644 --- a/chromium/config/Chromium/win/x64/config.h +++ b/chromium/config/Chromium/win/x64/config.h @@ -648,7 +648,7 @@ #define CONFIG_AUDIO_FRAME_QUEUE 0 #define CONFIG_AUDIODSP 0 #define CONFIG_BLOCKDSP 0 -#define CONFIG_BSWAPDSP 0 +#define CONFIG_BSWAPDSP 1 #define CONFIG_CABAC 0 #define CONFIG_CBS 0 #define CONFIG_CBS_AV1 0 @@ -660,7 +660,7 @@ #define CONFIG_DEFLATE_WRAPPER 0 #define CONFIG_DIRAC_PARSE 1 #define CONFIG_DNN 0 -#define CONFIG_DOVI_RPU 0 +#define CONFIG_DOVI_RPU 1 #define CONFIG_DVPROFILE 0 #define CONFIG_EXIF 0 #define CONFIG_FAANDCT 0 @@ -678,7 +678,7 @@ #define CONFIG_H264PARSE 0 #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 0 -#define CONFIG_HEVCPARSE 0 +#define CONFIG_HEVCPARSE 1 #define CONFIG_HPELDSP 1 #define CONFIG_HUFFMAN 0 #define CONFIG_HUFFYUVDSP 0 diff --git a/chromium/config/Chromium/win/x64/config_components.h b/chromium/config/Chromium/win/x64/config_components.h index 227b155c2a..3555106975 100644 --- a/chromium/config/Chromium/win/x64/config_components.h +++ b/chromium/config/Chromium/win/x64/config_components.h @@ -132,7 +132,7 @@ #define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_RKMPP_DECODER 0 #define CONFIG_HAP_DECODER 0 -#define CONFIG_HEVC_DECODER 0 +#define CONFIG_HEVC_DECODER 1 #define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HEVC_RKMPP_DECODER 0 #define CONFIG_HEVC_V4L2M2M_DECODER 0 @@ -927,7 +927,7 @@ #define CONFIG_H261_PARSER 0 #define CONFIG_H263_PARSER 0 #define CONFIG_H264_PARSER 0 -#define CONFIG_HEVC_PARSER 0 +#define CONFIG_HEVC_PARSER 1 #define CONFIG_IPU_PARSER 0 #define CONFIG_JPEG2000_PARSER 0 #define CONFIG_MJPEG_PARSER 0 diff --git a/chromium/config/Chromium/win/x64/libavcodec/codec_list.c b/chromium/config/Chromium/win/x64/libavcodec/codec_list.c index 653357d362..9181e1cb68 100644 --- a/chromium/config/Chromium/win/x64/libavcodec/codec_list.c +++ b/chromium/config/Chromium/win/x64/libavcodec/codec_list.c @@ -15,4 +15,5 @@ static const FFCodec * const codec_list[] = { &ff_pcm_s32le_decoder, &ff_pcm_u8_decoder, &ff_libopus_decoder, + &ff_hevc_decoder, NULL }; diff --git a/chromium/config/Chromium/win/x64/libavcodec/parser_list.c b/chromium/config/Chromium/win/x64/libavcodec/parser_list.c index f81fbe8bbc..2d65b7d8ad 100644 --- a/chromium/config/Chromium/win/x64/libavcodec/parser_list.c +++ b/chromium/config/Chromium/win/x64/libavcodec/parser_list.c @@ -6,4 +6,5 @@ static const AVCodecParser * const parser_list[] = { &ff_vp3_parser, &ff_vp8_parser, &ff_vp9_parser, + &ff_hevc_parser, NULL }; diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py index e7d4e42fc3..3b79f77058 100755 --- a/chromium/scripts/build_ffmpeg.py +++ b/chromium/scripts/build_ffmpeg.py @@ -985,9 +985,9 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, # Google Chrome & ChromeOS specific configuration. configure_flags['Chrome'].extend([ - '--enable-decoder=aac,h264', + '--enable-decoder=aac,h264,hevc', '--enable-demuxer=aac', - '--enable-parser=aac,h264', + '--enable-parser=aac,h264,hevc', ]) # Google ChromeOS specific configuration. diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni index b8e65c5ee9..56f506ffb6 100644 --- a/ffmpeg_generated.gni +++ b/ffmpeg_generated.gni @@ -265,7 +265,11 @@ if (use_linux_config && ffmpeg_branding == "ChromeOS") { if ((is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && ffmpeg_branding == "Chrome") || (use_linux_config && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/atsc_a53.c", + "libavcodec/autorename_libavcodec_bswapdsp.c", "libavcodec/cabac.c", + "libavcodec/dovi_rpu.c", + "libavcodec/dynamic_hdr10_plus.c", + "libavcodec/dynamic_hdr_vivid.c", "libavcodec/h2645_parse.c", "libavcodec/h264_cabac.c", "libavcodec/h264_cavlc.c", @@ -286,6 +290,18 @@ if ((is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Ch "libavcodec/h264idct.c", "libavcodec/h264qpel.c", "libavcodec/h274.c", + "libavcodec/hevc_cabac.c", + "libavcodec/hevc_data.c", + "libavcodec/hevc_filter.c", + "libavcodec/hevc_mvs.c", + "libavcodec/hevc_parse.c", + "libavcodec/hevc_parser.c", + "libavcodec/hevc_ps.c", + "libavcodec/hevc_refs.c", + "libavcodec/hevc_sei.c", + "libavcodec/hevcdec.c", + "libavcodec/hevcdsp.c", + "libavcodec/hevcpred.c", "libavcodec/startcode.c", ] } @@ -387,11 +403,14 @@ if ((is_mac && current_cpu == "x64") || (is_win && current_cpu == "x64") || (is_ if ((is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ + "libavcodec/x86/bswapdsp_init.c", "libavcodec/x86/h264_qpel.c", "libavcodec/x86/h264chroma_init.c", "libavcodec/x86/h264dsp_init.c", + "libavcodec/x86/hevcdsp_init.c", ] ffmpeg_asm_sources += [ + "libavcodec/x86/bswapdsp.asm", "libavcodec/x86/h264_chromamc.asm", "libavcodec/x86/h264_chromamc_10bit.asm", "libavcodec/x86/h264_deblock.asm", @@ -402,6 +421,12 @@ if ((is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win & "libavcodec/x86/h264_qpel_8bit.asm", "libavcodec/x86/h264_weight.asm", "libavcodec/x86/h264_weight_10bit.asm", + "libavcodec/x86/hevc_add_res.asm", + "libavcodec/x86/hevc_deblock.asm", + "libavcodec/x86/hevc_idct.asm", + "libavcodec/x86/hevc_mc.asm", + "libavcodec/x86/hevc_sao.asm", + "libavcodec/x86/hevc_sao_10bit.asm", "libavcodec/x86/qpel.asm", ] } @@ -533,12 +558,15 @@ if ((is_mac && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_win "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", "libavcodec/aarch64/h264qpel_init_aarch64.c", + "libavcodec/aarch64/hevcdsp_init_aarch64.c", ] ffmpeg_gas_sources += [ "libavcodec/aarch64/autorename_libavcodec_aarch64_h264cmc_neon.S", "libavcodec/aarch64/autorename_libavcodec_aarch64_h264dsp_neon.S", "libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S", "libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S", + "libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S", + "libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S", ] } @@ -601,6 +629,7 @@ if ((use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", "libavcodec/arm/h264qpel_init_arm.c", + "libavcodec/arm/hevcdsp_init_arm.c", ] ffmpeg_gas_sources += [ "libavcodec/arm/startcode_armv6.S", @@ -608,11 +637,18 @@ if ((use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding } 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")) { + ffmpeg_c_sources += [ + "libavcodec/arm/hevcdsp_init_neon.c", + ] ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", "libavcodec/arm/h264idct_neon.S", "libavcodec/arm/h264qpel_neon.S", + "libavcodec/arm/hevcdsp_deblock_neon.S", + "libavcodec/arm/hevcdsp_idct_neon.S", + "libavcodec/arm/hevcdsp_qpel_neon.S", + "libavcodec/arm/hevcdsp_sao_neon.S", ] } diff --git a/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S new file mode 100644 index 0000000000..26b255b3a2 --- /dev/null +++ b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_idct_neon.S @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "hevcdsp_idct_neon.S" \ No newline at end of file diff --git a/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S new file mode 100644 index 0000000000..9479c7f4a5 --- /dev/null +++ b/libavcodec/aarch64/autorename_libavcodec_aarch64_hevcdsp_sao_neon.S @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "hevcdsp_sao_neon.S" \ No newline at end of file diff --git a/libavcodec/autorename_libavcodec_bswapdsp.c b/libavcodec/autorename_libavcodec_bswapdsp.c new file mode 100644 index 0000000000..3accbac3e4 --- /dev/null +++ b/libavcodec/autorename_libavcodec_bswapdsp.c @@ -0,0 +1,2 @@ +// File automatically generated. See crbug.com/495833. +#include "bswapdsp.c" \ No newline at end of file -- 2.36.1.windows.1