diff --git a/SMP/config.asm b/SMP/config.asm index 37f59ebe93cda3247324fc421152d666f9a4bd08..d91f77724cee8c0bf850016b6ecd14418a192e1e 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -516,7 +516,6 @@ %define CONFIG_LIBVMAF 0 %define CONFIG_LIBVORBIS 1 %define CONFIG_LIBVPX 1 -%define CONFIG_LIBWAVPACK 0 %define CONFIG_LIBWEBP 0 %define CONFIG_LIBXML2 1 %define CONFIG_LIBZIMG 0 @@ -765,6 +764,7 @@ %define CONFIG_ANSI_DECODER 1 %define CONFIG_APNG_DECODER 1 %define CONFIG_ARBC_DECODER 1 +%define CONFIG_ARGO_DECODER 1 %define CONFIG_ASV1_DECODER 1 %define CONFIG_ASV2_DECODER 1 %define CONFIG_AURA_DECODER 1 @@ -863,6 +863,7 @@ %define CONFIG_INDEO4_DECODER 1 %define CONFIG_INDEO5_DECODER 1 %define CONFIG_INTERPLAY_VIDEO_DECODER 1 +%define CONFIG_IPU_DECODER 1 %define CONFIG_JPEG2000_DECODER 1 %define CONFIG_JPEGLS_DECODER 1 %define CONFIG_JV_DECODER 1 @@ -1279,6 +1280,7 @@ %define CONFIG_XBIN_DECODER 1 %define CONFIG_IDF_DECODER 1 %define CONFIG_LIBAOM_AV1_DECODER 0 +%define CONFIG_AV1_DECODER 1 %define CONFIG_LIBOPENH264_DECODER 0 %define CONFIG_H264_CUVID_DECODER 1 %define CONFIG_HEVC_CUVID_DECODER 1 @@ -1296,6 +1298,7 @@ %define CONFIG_VP9_CUVID_DECODER 1 %define CONFIG_VP9_MEDIACODEC_DECODER 0 %define CONFIG_VP9_QSV_DECODER 1 +%define CONFIG_AV1_QSV_DECODER 1 %define CONFIG_A64MULTI_ENCODER 1 %define CONFIG_A64MULTI5_ENCODER 1 %define CONFIG_ALIAS_PIX_ENCODER 1 @@ -1481,7 +1484,6 @@ %define CONFIG_LIBVORBIS_ENCODER 1 %define CONFIG_LIBVPX_VP8_ENCODER 1 %define CONFIG_LIBVPX_VP9_ENCODER 1 -%define CONFIG_LIBWAVPACK_ENCODER 0 %define CONFIG_LIBWEBP_ANIM_ENCODER 0 %define CONFIG_LIBWEBP_ENCODER 0 %define CONFIG_LIBX262_ENCODER 0 @@ -1605,6 +1607,7 @@ %define CONFIG_H263_PARSER 1 %define CONFIG_H264_PARSER 1 %define CONFIG_HEVC_PARSER 1 +%define CONFIG_IPU_PARSER 1 %define CONFIG_JPEG2000_PARSER 1 %define CONFIG_MJPEG_PARSER 1 %define CONFIG_MLP_PARSER 1 @@ -2123,6 +2126,7 @@ %define CONFIG_FIFO_FILTER 1 %define CONFIG_AA_DEMUXER 1 %define CONFIG_AAC_DEMUXER 1 +%define CONFIG_AAX_DEMUXER 1 %define CONFIG_AC3_DEMUXER 1 %define CONFIG_ACM_DEMUXER 1 %define CONFIG_ACT_DEMUXER 1 @@ -2147,6 +2151,7 @@ %define CONFIG_APTX_HD_DEMUXER 1 %define CONFIG_AQTITLE_DEMUXER 1 %define CONFIG_ARGO_ASF_DEMUXER 1 +%define CONFIG_ARGO_BRP_DEMUXER 1 %define CONFIG_ASF_DEMUXER 1 %define CONFIG_ASF_O_DEMUXER 1 %define CONFIG_ASS_DEMUXER 1 @@ -2239,6 +2244,7 @@ %define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1 %define CONFIG_INGENIENT_DEMUXER 1 %define CONFIG_IPMOVIE_DEMUXER 1 +%define CONFIG_IPU_DEMUXER 1 %define CONFIG_IRCAM_DEMUXER 1 %define CONFIG_ISS_DEMUXER 1 %define CONFIG_IV8_DEMUXER 1 @@ -2250,10 +2256,12 @@ %define CONFIG_KVAG_DEMUXER 1 %define CONFIG_LMLM4_DEMUXER 1 %define CONFIG_LOAS_DEMUXER 1 +%define CONFIG_LUODAT_DEMUXER 1 %define CONFIG_LRC_DEMUXER 1 %define CONFIG_LVF_DEMUXER 1 %define CONFIG_LXF_DEMUXER 1 %define CONFIG_M4V_DEMUXER 1 +%define CONFIG_MCA_DEMUXER 1 %define CONFIG_MCC_DEMUXER 1 %define CONFIG_MATROSKA_DEMUXER 1 %define CONFIG_MGSTS_DEMUXER 1 @@ -2363,6 +2371,7 @@ %define CONFIG_SUBVIEWER_DEMUXER 1 %define CONFIG_SUP_DEMUXER 1 %define CONFIG_SVAG_DEMUXER 1 +%define CONFIG_SVS_DEMUXER 1 %define CONFIG_SWF_DEMUXER 1 %define CONFIG_TAK_DEMUXER 1 %define CONFIG_TEDCAPTIONS_DEMUXER 1 diff --git a/SMP/config.h b/SMP/config.h index 30e2797399a78921f60173d5ba8c7e9766dfa29b..38dab50fab5239b132951cd97e612df57a00380d 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -574,7 +574,6 @@ #define CONFIG_LIBVMAF 0 #define CONFIG_LIBVORBIS 1 #define CONFIG_LIBVPX 1 -#define CONFIG_LIBWAVPACK 0 #define CONFIG_LIBWEBP 0 #define CONFIG_LIBXML2 1 #define CONFIG_LIBZIMG 0 @@ -835,6 +834,7 @@ #define CONFIG_ANSI_DECODER 1 #define CONFIG_APNG_DECODER 1 #define CONFIG_ARBC_DECODER 1 +#define CONFIG_ARGO_DECODER 1 #define CONFIG_ASV1_DECODER 1 #define CONFIG_ASV2_DECODER 1 #define CONFIG_AURA_DECODER 1 @@ -933,6 +933,7 @@ #define CONFIG_INDEO4_DECODER 1 #define CONFIG_INDEO5_DECODER 1 #define CONFIG_INTERPLAY_VIDEO_DECODER 1 +#define CONFIG_IPU_DECODER 1 #define CONFIG_JPEG2000_DECODER 1 #define CONFIG_JPEGLS_DECODER 1 #define CONFIG_JV_DECODER 1 @@ -1349,6 +1350,7 @@ #define CONFIG_XBIN_DECODER 1 #define CONFIG_IDF_DECODER 1 #define CONFIG_LIBAOM_AV1_DECODER 0 +#define CONFIG_AV1_DECODER 1 #define CONFIG_LIBOPENH264_DECODER 0 #define CONFIG_H264_CUVID_DECODER 1 #define CONFIG_HEVC_CUVID_DECODER 1 @@ -1366,6 +1368,7 @@ #define CONFIG_VP9_CUVID_DECODER 1 #define CONFIG_VP9_MEDIACODEC_DECODER 0 #define CONFIG_VP9_QSV_DECODER 1 +#define CONFIG_AV1_QSV_DECODER 1 #define CONFIG_A64MULTI_ENCODER 1 #define CONFIG_A64MULTI5_ENCODER 1 #define CONFIG_ALIAS_PIX_ENCODER 1 @@ -1551,7 +1554,6 @@ #define CONFIG_LIBVORBIS_ENCODER 1 #define CONFIG_LIBVPX_VP8_ENCODER 1 #define CONFIG_LIBVPX_VP9_ENCODER 1 -#define CONFIG_LIBWAVPACK_ENCODER 0 #define CONFIG_LIBWEBP_ANIM_ENCODER 0 #define CONFIG_LIBWEBP_ENCODER 0 #define CONFIG_LIBX262_ENCODER 0 @@ -1727,6 +1729,7 @@ #define CONFIG_H263_PARSER 1 #define CONFIG_H264_PARSER 1 #define CONFIG_HEVC_PARSER 1 +#define CONFIG_IPU_PARSER 1 #define CONFIG_JPEG2000_PARSER 1 #define CONFIG_MJPEG_PARSER 1 #define CONFIG_MLP_PARSER 1 @@ -2245,6 +2248,7 @@ #define CONFIG_FIFO_FILTER 1 #define CONFIG_AA_DEMUXER 1 #define CONFIG_AAC_DEMUXER 1 +#define CONFIG_AAX_DEMUXER 1 #define CONFIG_AC3_DEMUXER 1 #define CONFIG_ACM_DEMUXER 1 #define CONFIG_ACT_DEMUXER 1 @@ -2269,6 +2273,7 @@ #define CONFIG_APTX_HD_DEMUXER 1 #define CONFIG_AQTITLE_DEMUXER 1 #define CONFIG_ARGO_ASF_DEMUXER 1 +#define CONFIG_ARGO_BRP_DEMUXER 1 #define CONFIG_ASF_DEMUXER 1 #define CONFIG_ASF_O_DEMUXER 1 #define CONFIG_ASS_DEMUXER 1 @@ -2361,6 +2366,7 @@ #define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1 #define CONFIG_INGENIENT_DEMUXER 1 #define CONFIG_IPMOVIE_DEMUXER 1 +#define CONFIG_IPU_DEMUXER 1 #define CONFIG_IRCAM_DEMUXER 1 #define CONFIG_ISS_DEMUXER 1 #define CONFIG_IV8_DEMUXER 1 @@ -2372,10 +2378,12 @@ #define CONFIG_KVAG_DEMUXER 1 #define CONFIG_LMLM4_DEMUXER 1 #define CONFIG_LOAS_DEMUXER 1 +#define CONFIG_LUODAT_DEMUXER 1 #define CONFIG_LRC_DEMUXER 1 #define CONFIG_LVF_DEMUXER 1 #define CONFIG_LXF_DEMUXER 1 #define CONFIG_M4V_DEMUXER 1 +#define CONFIG_MCA_DEMUXER 1 #define CONFIG_MCC_DEMUXER 1 #define CONFIG_MATROSKA_DEMUXER 1 #define CONFIG_MGSTS_DEMUXER 1 @@ -2485,6 +2493,7 @@ #define CONFIG_SUBVIEWER_DEMUXER 1 #define CONFIG_SUP_DEMUXER 1 #define CONFIG_SVAG_DEMUXER 1 +#define CONFIG_SVS_DEMUXER 1 #define CONFIG_SWF_DEMUXER 1 #define CONFIG_TAK_DEMUXER 1 #define CONFIG_TEDCAPTIONS_DEMUXER 1 diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def index 33be7a1f73891c36dfd59c4ba2b8e92134839d92..d8c0ee8fb393eed23c694941626fcbd40a804f04 100644 --- a/SMP/libavcodec.def +++ b/SMP/libavcodec.def @@ -218,6 +218,9 @@ EXPORTS avpriv_mpeg4audio_get_config avpriv_mpeg4audio_get_config2 avpriv_mpegaudio_decode_header + avpriv_packet_list_free + avpriv_packet_list_get + avpriv_packet_list_put avpriv_put_string avpriv_split_xiph_headers avpriv_tak_parse_streaminfo diff --git a/SMP/libavcodec.vcxproj b/SMP/libavcodec.vcxproj index 8b3e13cb13693a0bdcbdf7f849d7f5b94c0fd232..feef1adb1f9c365585734e802824902b3d6e28fd 100644 --- a/SMP/libavcodec.vcxproj +++ b/SMP/libavcodec.vcxproj @@ -349,6 +349,7 @@ + @@ -364,6 +365,7 @@ + @@ -570,6 +572,7 @@ + @@ -617,7 +620,6 @@ - @@ -775,7 +777,6 @@ - @@ -935,6 +936,7 @@ + diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index 6d82bb1c4ad67205a8b089fbb77db418687dadad..d7f578f01abae97c7c006c95e1fa66739f121a3b 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -897,6 +897,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -942,6 +945,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1560,6 +1566,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1701,9 +1710,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2175,9 +2181,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2655,6 +2658,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c index c736c7fed2a4692b17c047f8dcc43da95a31d269..ac2da76bf876247e8c4e463351ff791298928503 100644 --- a/SMP/libavcodec/codec_list.c +++ b/SMP/libavcodec/codec_list.c @@ -216,6 +216,7 @@ static const AVCodec *codec_list[] = { &ff_ansi_decoder, &ff_apng_decoder, &ff_arbc_decoder, + &ff_argo_decoder, &ff_asv1_decoder, &ff_asv2_decoder, &ff_aura_decoder, @@ -306,6 +307,7 @@ static const AVCodec *codec_list[] = { &ff_indeo4_decoder, &ff_indeo5_decoder, &ff_interplay_video_decoder, + &ff_ipu_decoder, &ff_jpeg2000_decoder, &ff_jpegls_decoder, &ff_jv_decoder, @@ -676,6 +678,7 @@ static const AVCodec *codec_list[] = { &ff_bintext_decoder, &ff_xbin_decoder, &ff_idf_decoder, + &ff_av1_decoder, &ff_h264_cuvid_decoder, &ff_hevc_cuvid_decoder, &ff_mjpeg_cuvid_decoder, @@ -688,4 +691,5 @@ static const AVCodec *codec_list[] = { &ff_vp8_qsv_decoder, &ff_vp9_cuvid_decoder, &ff_vp9_qsv_decoder, + &ff_av1_qsv_decoder, NULL }; \ No newline at end of file diff --git a/SMP/libavcodec/parser_list.c b/SMP/libavcodec/parser_list.c index 6e095e61cd8b078ee38d18c14494ca0214dc8ee2..6f2350b61c37ed8a3269c27c8464e1d6e706c6c8 100644 --- a/SMP/libavcodec/parser_list.c +++ b/SMP/libavcodec/parser_list.c @@ -45,6 +45,7 @@ static const AVCodecParser *parser_list[] = { &ff_h263_parser, &ff_h264_parser, &ff_hevc_parser, + &ff_ipu_parser, &ff_jpeg2000_parser, &ff_mjpeg_parser, &ff_mlp_parser, diff --git a/SMP/libavfilter.vcxproj b/SMP/libavfilter.vcxproj index 3550a22355ff5d6b00aff6ac669081a560c1e0ea..b6abe08cc81e6cd01ed410a6ddedcfb6b5a46902 100644 --- a/SMP/libavfilter.vcxproj +++ b/SMP/libavfilter.vcxproj @@ -414,9 +414,11 @@ + + diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index 4337cab9dd583678bc69253b4c24a7d53c82cb6c..8f01ede019fdd338cce8c7604e3491a6b4272db9 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -1095,6 +1095,9 @@ Source Files\libavfilter\dnn + + Source Files\libavfilter\dnn + Source Files\libavfilter\dnn @@ -1104,6 +1107,9 @@ Source Files\libavfilter\dnn + + Source Files\libavfilter\dnn + Source Files\libavfilter\dnn diff --git a/SMP/libavformat.vcxproj b/SMP/libavformat.vcxproj index 222f2912e110f6c1dcb46e4a1cdf64716efad07e..e2f4a12ad198d4378fed993d6a44ed49f829525b 100644 --- a/SMP/libavformat.vcxproj +++ b/SMP/libavformat.vcxproj @@ -121,6 +121,7 @@ + @@ -151,6 +152,7 @@ + @@ -277,6 +279,7 @@ + @@ -294,6 +297,7 @@ + @@ -306,6 +310,7 @@ + @@ -449,6 +454,7 @@ + diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index e8ec9cd8692d36d47084aca343f4b240b69b2008..2696fe8615d31d7ac779b79b3c485345e3030fc9 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -214,6 +214,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -304,6 +307,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -682,6 +688,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -733,6 +742,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -769,6 +781,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1198,6 +1213,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c index 7672b655621ed3adc7eeae54a107ab0d5393db3b..299bc05ffe2ac5562ed5ebaa39d7c6b724ffa338 100644 --- a/SMP/libavformat/demuxer_list.c +++ b/SMP/libavformat/demuxer_list.c @@ -21,6 +21,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_aa_demuxer, &ff_aac_demuxer, + &ff_aax_demuxer, &ff_ac3_demuxer, &ff_acm_demuxer, &ff_act_demuxer, @@ -45,6 +46,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_aptx_hd_demuxer, &ff_aqtitle_demuxer, &ff_argo_asf_demuxer, + &ff_argo_brp_demuxer, &ff_asf_demuxer, &ff_asf_o_demuxer, &ff_ass_demuxer, @@ -136,6 +138,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_image2_brender_pix_demuxer, &ff_ingenient_demuxer, &ff_ipmovie_demuxer, + &ff_ipu_demuxer, &ff_ircam_demuxer, &ff_iss_demuxer, &ff_iv8_demuxer, @@ -147,10 +150,12 @@ static const AVInputFormat *demuxer_list[] = { &ff_kvag_demuxer, &ff_lmlm4_demuxer, &ff_loas_demuxer, + &ff_luodat_demuxer, &ff_lrc_demuxer, &ff_lvf_demuxer, &ff_lxf_demuxer, &ff_m4v_demuxer, + &ff_mca_demuxer, &ff_mcc_demuxer, &ff_matroska_demuxer, &ff_mgsts_demuxer, @@ -260,6 +265,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_subviewer_demuxer, &ff_sup_demuxer, &ff_svag_demuxer, + &ff_svs_demuxer, &ff_swf_demuxer, &ff_tak_demuxer, &ff_tedcaptions_demuxer, diff --git a/SMP/libavutil.def b/SMP/libavutil.def index 81efba20044fa5ec4707f58a9ce5f0dad975c796..962f540b5276b9a1ddb718adaffbc482e22a1f98 100644 --- a/SMP/libavutil.def +++ b/SMP/libavutil.def @@ -63,6 +63,7 @@ EXPORTS av_buffer_pool_uninit av_buffer_realloc av_buffer_ref + av_buffer_replace av_buffer_unref av_calloc av_camellia_alloc @@ -488,6 +489,7 @@ EXPORTS av_timecode_init_from_string av_timecode_make_mpeg_tc_string av_timecode_make_smpte_tc_string + av_timecode_make_smpte_tc_string2 av_timecode_make_string av_timegm av_tree_destroy