From d4b3709a5b6fb9f384d19c08bda951f887a4b630 Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Tue, 14 May 2024 02:58:36 -0500 Subject: [PATCH] fix ac3 patch --- other/ffmpeg_hevc_ac3.patch | 324 +++++++++++++++++++----------------- 1 file changed, 167 insertions(+), 157 deletions(-) diff --git a/other/ffmpeg_hevc_ac3.patch b/other/ffmpeg_hevc_ac3.patch index 4c15f85c..a6449d8d 100644 --- a/other/ffmpeg_hevc_ac3.patch +++ b/other/ffmpeg_hevc_ac3.patch @@ -1,8 +1,8 @@ diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h -index 946a48be7d..7bb9724cc5 100644 +index 98b659a3de..e43c410450 100644 --- a/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/x64/config.h -@@ -659,13 +659,13 @@ +@@ -667,7 +667,7 @@ #define CONFIG_MUXERS 0 #define CONFIG_PROTOCOLS 0 #define CONFIG_AANDCTTABLES 0 @@ -11,35 +11,8 @@ index 946a48be7d..7bb9724cc5 100644 #define CONFIG_ADTS_HEADER 1 #define CONFIG_ATSC_A53 1 #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 -@@ -679,7 +679,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_EVCPARSE 0 - #define CONFIG_EXIF 0 -@@ -698,8 +698,8 @@ - #define CONFIG_H264PRED 1 - #define CONFIG_H264QPEL 1 - #define CONFIG_H264_SEI 1 --#define CONFIG_HEVCPARSE 0 --#define CONFIG_HEVC_SEI 0 -+#define CONFIG_HEVCPARSE 1 -+#define CONFIG_HEVC_SEI 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 132d279fcf..92e1ac0fff 100644 +index 4e79eb091b..3fb519b01d 100644 --- a/chromium/config/Chrome/linux/x64/config_components.h +++ b/chromium/config/Chrome/linux/x64/config_components.h @@ -10,7 +10,7 @@ @@ -51,16 +24,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EXTRACT_EXTRADATA_BSF 0 #define CONFIG_FILTER_UNITS_BSF 0 #define CONFIG_H264_METADATA_BSF 0 -@@ -137,7 +137,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 -@@ -344,8 +344,8 @@ +@@ -346,8 +346,8 @@ #define CONFIG_AAC_DECODER 1 #define CONFIG_AAC_FIXED_DECODER 0 #define CONFIG_AAC_LATM_DECODER 0 @@ -71,7 +35,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_ACELP_KELVIN_DECODER 0 #define CONFIG_ALAC_DECODER 0 #define CONFIG_ALS_DECODER 0 -@@ -376,7 +376,7 @@ +@@ -378,7 +378,7 @@ #define CONFIG_DSICINAUDIO_DECODER 0 #define CONFIG_DSS_SP_DECODER 0 #define CONFIG_DST_DECODER 0 @@ -80,7 +44,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EVRC_DECODER 0 #define CONFIG_FASTAUDIO_DECODER 0 #define CONFIG_FFWAVESYNTH_DECODER 0 -@@ -564,11 +564,11 @@ +@@ -567,11 +567,11 @@ #define CONFIG_WEBVTT_DECODER 0 #define CONFIG_XSUB_DECODER 0 #define CONFIG_AAC_AT_DECODER 0 @@ -94,7 +58,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_GSM_MS_AT_DECODER 0 #define CONFIG_ILBC_AT_DECODER 0 #define CONFIG_MP1_AT_DECODER 0 -@@ -949,7 +949,7 @@ +@@ -960,7 +960,7 @@ #define CONFIG_WMV3_VDPAU_HWACCEL 0 #define CONFIG_AAC_PARSER 1 #define CONFIG_AAC_LATM_PARSER 0 @@ -103,16 +67,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_ADX_PARSER 0 #define CONFIG_AMR_PARSER 0 #define CONFIG_AV1_PARSER 0 -@@ -978,7 +978,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 -@@ -1611,7 +1611,7 @@ +@@ -1626,7 +1626,7 @@ #define CONFIG_AA_DEMUXER 0 #define CONFIG_AAC_DEMUXER 1 #define CONFIG_AAX_DEMUXER 0 @@ -121,7 +76,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_AC4_DEMUXER 0 #define CONFIG_ACE_DEMUXER 0 #define CONFIG_ACM_DEMUXER 0 -@@ -1694,7 +1694,7 @@ +@@ -1709,7 +1709,7 @@ #define CONFIG_DXA_DEMUXER 0 #define CONFIG_EA_DEMUXER 0 #define CONFIG_EA_CDATA_DEMUXER 0 @@ -131,27 +86,25 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EVC_DEMUXER 0 #define CONFIG_FFMETADATA_DEMUXER 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..1bc1adaf63 100644 +index c9666ae199..75415127f1 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/codec_list.c -@@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { - &ff_pcm_s32le_decoder, +@@ -15,4 +15,7 @@ static const FFCodec * const codec_list[] = { &ff_pcm_u8_decoder, &ff_libopus_decoder, -+ &ff_hevc_decoder, + &ff_hevc_decoder, + &ff_ac3_decoder, + &ff_eac3_decoder, + &ff_ac3_fixed_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..3cade58c41 100644 +index c85087a596..a9e086ef6d 100644 --- a/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/linux/x64/libavcodec/parser_list.c -@@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { - &ff_vp3_parser, - &ff_vp8_parser, +@@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { + &ff_vorbis_parser, &ff_vp9_parser, -+ &ff_hevc_parser, + &ff_hevc_parser, + &ff_ac3_parser, NULL }; diff --git a/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/x64/libavformat/demuxer_list.c @@ -165,11 +118,11 @@ index 920b22bfa7..d6d293dc60 100644 + &ff_ac3_demuxer, + &ff_eac3_demuxer, NULL }; -diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h -index 673e04ac5f..cd1335c2a6 100644 ---- a/chromium/config/Chrome/win/x64/config.h -+++ b/chromium/config/Chrome/win/x64/config.h -@@ -659,13 +659,13 @@ +diff --git a/chromium/config/Chrome/mac/x64/config.h b/chromium/config/Chrome/mac/x64/config.h +index 3b5d872b52..470252e5b3 100644 +--- a/chromium/config/Chrome/mac/x64/config.h ++++ b/chromium/config/Chrome/mac/x64/config.h +@@ -667,7 +667,7 @@ #define CONFIG_MUXERS 0 #define CONFIG_PROTOCOLS 0 #define CONFIG_AANDCTTABLES 0 @@ -178,37 +131,10 @@ index 673e04ac5f..cd1335c2a6 100644 #define CONFIG_ADTS_HEADER 1 #define CONFIG_ATSC_A53 1 #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 -@@ -679,7 +679,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_EVCPARSE 0 - #define CONFIG_EXIF 0 -@@ -698,8 +698,8 @@ - #define CONFIG_H264PRED 1 - #define CONFIG_H264QPEL 1 - #define CONFIG_H264_SEI 1 --#define CONFIG_HEVCPARSE 0 --#define CONFIG_HEVC_SEI 0 -+#define CONFIG_HEVCPARSE 1 -+#define CONFIG_HEVC_SEI 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 132d279fcf..92e1ac0fff 100644 ---- a/chromium/config/Chrome/win/x64/config_components.h -+++ b/chromium/config/Chrome/win/x64/config_components.h +diff --git a/chromium/config/Chrome/mac/x64/config_components.h b/chromium/config/Chrome/mac/x64/config_components.h +index 4e79eb091b..3fb519b01d 100644 +--- a/chromium/config/Chrome/mac/x64/config_components.h ++++ b/chromium/config/Chrome/mac/x64/config_components.h @@ -10,7 +10,7 @@ #define CONFIG_DCA_CORE_BSF 0 #define CONFIG_DTS2PTS_BSF 0 @@ -218,16 +144,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EXTRACT_EXTRADATA_BSF 0 #define CONFIG_FILTER_UNITS_BSF 0 #define CONFIG_H264_METADATA_BSF 0 -@@ -137,7 +137,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 -@@ -344,8 +344,8 @@ +@@ -346,8 +346,8 @@ #define CONFIG_AAC_DECODER 1 #define CONFIG_AAC_FIXED_DECODER 0 #define CONFIG_AAC_LATM_DECODER 0 @@ -238,7 +155,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_ACELP_KELVIN_DECODER 0 #define CONFIG_ALAC_DECODER 0 #define CONFIG_ALS_DECODER 0 -@@ -376,7 +376,7 @@ +@@ -378,7 +378,7 @@ #define CONFIG_DSICINAUDIO_DECODER 0 #define CONFIG_DSS_SP_DECODER 0 #define CONFIG_DST_DECODER 0 @@ -247,7 +164,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EVRC_DECODER 0 #define CONFIG_FASTAUDIO_DECODER 0 #define CONFIG_FFWAVESYNTH_DECODER 0 -@@ -564,11 +564,11 @@ +@@ -567,11 +567,11 @@ #define CONFIG_WEBVTT_DECODER 0 #define CONFIG_XSUB_DECODER 0 #define CONFIG_AAC_AT_DECODER 0 @@ -261,7 +178,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_GSM_MS_AT_DECODER 0 #define CONFIG_ILBC_AT_DECODER 0 #define CONFIG_MP1_AT_DECODER 0 -@@ -949,7 +949,7 @@ +@@ -960,7 +960,7 @@ #define CONFIG_WMV3_VDPAU_HWACCEL 0 #define CONFIG_AAC_PARSER 1 #define CONFIG_AAC_LATM_PARSER 0 @@ -270,16 +187,7 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_ADX_PARSER 0 #define CONFIG_AMR_PARSER 0 #define CONFIG_AV1_PARSER 0 -@@ -978,7 +978,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 -@@ -1611,7 +1611,7 @@ +@@ -1626,7 +1626,7 @@ #define CONFIG_AA_DEMUXER 0 #define CONFIG_AAC_DEMUXER 1 #define CONFIG_AAX_DEMUXER 0 @@ -288,7 +196,127 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_AC4_DEMUXER 0 #define CONFIG_ACE_DEMUXER 0 #define CONFIG_ACM_DEMUXER 0 -@@ -1694,7 +1694,7 @@ +@@ -1709,7 +1709,7 @@ + #define CONFIG_DXA_DEMUXER 0 + #define CONFIG_EA_DEMUXER 0 + #define CONFIG_EA_CDATA_DEMUXER 0 +-#define CONFIG_EAC3_DEMUXER 0 ++#define CONFIG_EAC3_DEMUXER 1 + #define CONFIG_EPAF_DEMUXER 0 + #define CONFIG_EVC_DEMUXER 0 + #define CONFIG_FFMETADATA_DEMUXER 0 +diff --git a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c +index c9666ae199..75415127f1 100644 +--- a/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c ++++ b/chromium/config/Chrome/mac/x64/libavcodec/codec_list.c +@@ -15,4 +15,7 @@ static const FFCodec * const codec_list[] = { + &ff_pcm_u8_decoder, + &ff_libopus_decoder, + &ff_hevc_decoder, ++ &ff_ac3_decoder, ++ &ff_eac3_decoder, ++ &ff_ac3_fixed_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 c85087a596..a9e086ef6d 100644 +--- a/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c ++++ b/chromium/config/Chrome/mac/x64/libavcodec/parser_list.c +@@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { + &ff_vorbis_parser, + &ff_vp9_parser, + &ff_hevc_parser, ++ &ff_ac3_parser, + NULL }; +diff --git a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c +index 920b22bfa7..d6d293dc60 100644 +--- a/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c ++++ b/chromium/config/Chrome/mac/x64/libavformat/demuxer_list.c +@@ -6,4 +6,6 @@ static const AVInputFormat * const demuxer_list[] = { + &ff_mp3_demuxer, + &ff_ogg_demuxer, + &ff_wav_demuxer, ++ &ff_ac3_demuxer, ++ &ff_eac3_demuxer, + NULL }; +diff --git a/chromium/config/Chrome/win/x64/config.h b/chromium/config/Chrome/win/x64/config.h +index 60bba62b39..c2f791466e 100644 +--- a/chromium/config/Chrome/win/x64/config.h ++++ b/chromium/config/Chrome/win/x64/config.h +@@ -667,7 +667,7 @@ + #define CONFIG_MUXERS 0 + #define CONFIG_PROTOCOLS 0 + #define CONFIG_AANDCTTABLES 0 +-#define CONFIG_AC3DSP 0 ++#define CONFIG_AC3DSP 1 + #define CONFIG_ADTS_HEADER 1 + #define CONFIG_ATSC_A53 1 + #define CONFIG_AUDIO_FRAME_QUEUE 0 +diff --git a/chromium/config/Chrome/win/x64/config_components.h b/chromium/config/Chrome/win/x64/config_components.h +index 4e79eb091b..3fb519b01d 100644 +--- a/chromium/config/Chrome/win/x64/config_components.h ++++ b/chromium/config/Chrome/win/x64/config_components.h +@@ -10,7 +10,7 @@ + #define CONFIG_DCA_CORE_BSF 0 + #define CONFIG_DTS2PTS_BSF 0 + #define CONFIG_DV_ERROR_MARKER_BSF 0 +-#define CONFIG_EAC3_CORE_BSF 0 ++#define CONFIG_EAC3_CORE_BSF 1 + #define CONFIG_EXTRACT_EXTRADATA_BSF 0 + #define CONFIG_FILTER_UNITS_BSF 0 + #define CONFIG_H264_METADATA_BSF 0 +@@ -346,8 +346,8 @@ + #define CONFIG_AAC_DECODER 1 + #define CONFIG_AAC_FIXED_DECODER 0 + #define CONFIG_AAC_LATM_DECODER 0 +-#define CONFIG_AC3_DECODER 0 +-#define CONFIG_AC3_FIXED_DECODER 0 ++#define CONFIG_AC3_DECODER 1 ++#define CONFIG_AC3_FIXED_DECODER 1 + #define CONFIG_ACELP_KELVIN_DECODER 0 + #define CONFIG_ALAC_DECODER 0 + #define CONFIG_ALS_DECODER 0 +@@ -378,7 +378,7 @@ + #define CONFIG_DSICINAUDIO_DECODER 0 + #define CONFIG_DSS_SP_DECODER 0 + #define CONFIG_DST_DECODER 0 +-#define CONFIG_EAC3_DECODER 0 ++#define CONFIG_EAC3_DECODER 1 + #define CONFIG_EVRC_DECODER 0 + #define CONFIG_FASTAUDIO_DECODER 0 + #define CONFIG_FFWAVESYNTH_DECODER 0 +@@ -567,11 +567,11 @@ + #define CONFIG_WEBVTT_DECODER 0 + #define CONFIG_XSUB_DECODER 0 + #define CONFIG_AAC_AT_DECODER 0 +-#define CONFIG_AC3_AT_DECODER 0 ++#define CONFIG_AC3_AT_DECODER 1 + #define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 + #define CONFIG_ALAC_AT_DECODER 0 + #define CONFIG_AMR_NB_AT_DECODER 0 +-#define CONFIG_EAC3_AT_DECODER 0 ++#define CONFIG_EAC3_AT_DECODER 1 + #define CONFIG_GSM_MS_AT_DECODER 0 + #define CONFIG_ILBC_AT_DECODER 0 + #define CONFIG_MP1_AT_DECODER 0 +@@ -960,7 +960,7 @@ + #define CONFIG_WMV3_VDPAU_HWACCEL 0 + #define CONFIG_AAC_PARSER 1 + #define CONFIG_AAC_LATM_PARSER 0 +-#define CONFIG_AC3_PARSER 0 ++#define CONFIG_AC3_PARSER 1 + #define CONFIG_ADX_PARSER 0 + #define CONFIG_AMR_PARSER 0 + #define CONFIG_AV1_PARSER 0 +@@ -1626,7 +1626,7 @@ + #define CONFIG_AA_DEMUXER 0 + #define CONFIG_AAC_DEMUXER 1 + #define CONFIG_AAX_DEMUXER 0 +-#define CONFIG_AC3_DEMUXER 0 ++#define CONFIG_AC3_DEMUXER 1 + #define CONFIG_AC4_DEMUXER 0 + #define CONFIG_ACE_DEMUXER 0 + #define CONFIG_ACM_DEMUXER 0 +@@ -1709,7 +1709,7 @@ #define CONFIG_DXA_DEMUXER 0 #define CONFIG_EA_DEMUXER 0 #define CONFIG_EA_CDATA_DEMUXER 0 @@ -298,27 +326,25 @@ index 132d279fcf..92e1ac0fff 100644 #define CONFIG_EVC_DEMUXER 0 #define CONFIG_FFMETADATA_DEMUXER 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..1bc1adaf63 100644 +index c9666ae199..75415127f1 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/codec_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/codec_list.c -@@ -17,4 +17,8 @@ static const FFCodec * const codec_list[] = { - &ff_pcm_s32le_decoder, +@@ -15,4 +15,7 @@ static const FFCodec * const codec_list[] = { &ff_pcm_u8_decoder, &ff_libopus_decoder, -+ &ff_hevc_decoder, + &ff_hevc_decoder, + &ff_ac3_decoder, + &ff_eac3_decoder, + &ff_ac3_fixed_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..3cade58c41 100644 +index c85087a596..d57aae769c 100644 --- a/chromium/config/Chrome/win/x64/libavcodec/parser_list.c +++ b/chromium/config/Chrome/win/x64/libavcodec/parser_list.c -@@ -8,4 +8,6 @@ static const AVCodecParser * const parser_list[] = { - &ff_vp3_parser, - &ff_vp8_parser, +@@ -7,4 +7,5 @@ static const AVCodecParser * const parser_list[] = { + &ff_vorbis_parser, &ff_vp9_parser, -+ &ff_hevc_parser, + &ff_hevc_parser, + &ff_ac3_parser, NULL }; diff --git a/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/win/x64/libavformat/demuxer_list.c @@ -333,29 +359,14 @@ index 920b22bfa7..d6d293dc60 100644 + &ff_eac3_demuxer, NULL }; diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni -index ce648b73f8..6064f8d302 100644 +index 16e1b7c3ff..b5a6b146da 100644 --- a/ffmpeg_generated.gni +++ b/ffmpeg_generated.gni -@@ -397,6 +397,54 @@ if ((use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_con - } - - if ((is_apple) || (is_win) || (use_linux_config)) { -+ ## HERE!!!! -+ ffmpeg_c_sources += [ -+ "libavcodec/autorename_libavcodec_bswapdsp.c", -+ "libavcodec/dovi_rpu.c", -+ "libavcodec/dynamic_hdr_vivid.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", +@@ -265,7 +265,37 @@ if ((is_apple && ffmpeg_branding == "Chrome") || + "libavcodec/hevc_sei.c", + "libavcodec/hevcdec.c", + "libavcodec/hevcdsp.c", +- "libavcodec/hevcpred.c" + "libavcodec/hevcpred.c", + "libavcodec/x86/ac3dsp_init.c", + "libavcodec/ac3dsp.c", @@ -370,7 +381,7 @@ index ce648b73f8..6064f8d302 100644 + "libavcodec/ac3dec_fixed.c", + "libavformat/ac3dec.c", + ] -+ ++ + ffmpeg_c_sources += [ + "libavcodec/x86/bswapdsp_init.c", + "libavcodec/x86/hevcdsp_init.c" @@ -387,7 +398,6 @@ index ce648b73f8..6064f8d302 100644 + "libavcodec/x86/ac3dsp.asm", + "libavcodec/x86/ac3dsp_downmix.asm", + "libavcodec/x86/fmtconvert.asm", -+ ] + ] + ffmpeg_c_sources += [ - "libavcodec/autorename_libavcodec_videodsp.c", - "libavcodec/h264pred.c",