From 2fbe1f77ad063d9f6959f5bc2a05f47f9694c246 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Sun, 12 Mar 2023 00:50:08 +1100 Subject: [PATCH] project: Update for upstream merge. --- SMP/SMP.patch | 2 +- SMP/config.asm | 24 +++--- SMP/config.h | 26 +++---- SMP/config_components.h | 52 ++++++++++++- SMP/libavcodec.def | 1 - SMP/libavcodec.vcxproj.filters | 55 +++++++++---- .../{log2_tab_wrap.c => amfenc_av1_wrap.c} | 6 +- SMP/libavcodec/bsf_list.c | 1 + SMP/libavcodec/codec_list.c | 15 ++++ .../{reverse_wrap.c => nvenc_av1_wrap.c} | 6 +- SMP/libavcodec/nvenc_wrap.c | 2 +- SMP/libavcodec_files.props | 39 ++++++++-- SMP/libavcodec_winrt.vcxproj.filters | 55 +++++++++---- SMP/libavdevice.def | 3 - SMP/libavdevice/outdev_list.c | 2 +- SMP/libavfilter.def | 10 ++- SMP/libavfilter.vcxproj.filters | 22 ++++-- SMP/libavfilter/filter_list.c | 11 +++ SMP/libavfilter/vf_deinterlace_qsv_wrap.c | 26 ------- SMP/libavfilter/vf_scale_qsv_wrap.c | 26 ------- .../{log2_tab_wrap.c => vf_stack_qsv_wrap.c} | 6 +- SMP/libavfilter/vf_vpp_qsv_wrap.c | 2 +- SMP/libavfilter_files.props | 15 +++- SMP/libavfilter_winrt.vcxproj.filters | 22 ++++-- SMP/libavformat.vcxproj.filters | 47 +++++++++-- SMP/libavformat/ac3_channel_layout_tab_wrap.c | 26 ------- SMP/libavformat/dca_sample_rate_tab_wrap.c | 26 ------- SMP/libavformat/demuxer_list.c | 5 ++ SMP/libavformat/golomb_tab_wrap.c | 26 ------- SMP/libavformat/jpegtables_wrap.c | 26 ------- SMP/libavformat/log2_tab_wrap.c | 26 ------- .../mpeg4audio_sample_rates_wrap.c | 26 ------- SMP/libavformat/mpegaudiotabs_wrap.c | 26 ------- SMP/libavformat/muxer_list.c | 2 +- SMP/libavformat/protocol_list.c | 5 +- SMP/libavformat/to_upper4_wrap.c | 26 ------- SMP/libavformat_files.props | 77 +++++++++++++++++-- SMP/libavformat_winrt.vcxproj.filters | 47 +++++++++-- SMP/libavutil.def | 9 +-- SMP/libavutil.vcxproj | 10 +++ SMP/libavutil.vcxproj.filters | 9 ++- SMP/libavutil_files.props | 3 +- SMP/libavutil_winrt.vcxproj | 10 +++ SMP/libavutil_winrt.vcxproj.filters | 9 ++- SMP/libswresample.vcxproj.filters | 8 +- SMP/libswresample/log2_tab_wrap.c | 26 ------- SMP/libswresample_files.props | 9 ++- SMP/libswresample_winrt.vcxproj.filters | 8 +- SMP/libswscale.vcxproj.filters | 8 +- SMP/libswscale/log2_tab_wrap.c | 26 ------- SMP/libswscale_files.props | 9 ++- SMP/libswscale_winrt.vcxproj.filters | 8 +- SMP/project_get_dependencies.bat | 5 +- 53 files changed, 507 insertions(+), 470 deletions(-) rename SMP/libavcodec/{log2_tab_wrap.c => amfenc_av1_wrap.c} (88%) rename SMP/libavcodec/{reverse_wrap.c => nvenc_av1_wrap.c} (88%) delete mode 100644 SMP/libavfilter/vf_deinterlace_qsv_wrap.c delete mode 100644 SMP/libavfilter/vf_scale_qsv_wrap.c rename SMP/libavfilter/{log2_tab_wrap.c => vf_stack_qsv_wrap.c} (84%) delete mode 100644 SMP/libavformat/ac3_channel_layout_tab_wrap.c delete mode 100644 SMP/libavformat/dca_sample_rate_tab_wrap.c delete mode 100644 SMP/libavformat/golomb_tab_wrap.c delete mode 100644 SMP/libavformat/jpegtables_wrap.c delete mode 100644 SMP/libavformat/log2_tab_wrap.c delete mode 100644 SMP/libavformat/mpeg4audio_sample_rates_wrap.c delete mode 100644 SMP/libavformat/mpegaudiotabs_wrap.c delete mode 100644 SMP/libavformat/to_upper4_wrap.c delete mode 100644 SMP/libswresample/log2_tab_wrap.c delete mode 100644 SMP/libswscale/log2_tab_wrap.c diff --git a/SMP/SMP.patch b/SMP/SMP.patch index c7e77d24214e9..3e4e76c1bc8bd 100644 --- a/SMP/SMP.patch +++ b/SMP/SMP.patch @@ -13,7 +13,7 @@ index 8a06df82df..9a31622bb4 100644 #include "libavdevice/version.h" diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c -index 36a6d8482d..bcb42d47fc 100644 +index f3415df10b..42f36b77bb 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -59,6 +59,10 @@ typedef struct MFContext { diff --git a/SMP/config.asm b/SMP/config.asm index 57345073d067b..149a14268acb6 100644 --- a/SMP/config.asm +++ b/SMP/config.asm @@ -445,27 +445,27 @@ %define CONFIG_MANPAGES 0 %define CONFIG_PODPAGES 0 %define CONFIG_TXTPAGES 0 +%define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0 %define CONFIG_AVIO_LIST_DIR_EXAMPLE 0 -%define CONFIG_AVIO_READING_EXAMPLE 0 +%define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0 %define CONFIG_DECODE_AUDIO_EXAMPLE 0 +%define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0 +%define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0 %define CONFIG_DECODE_VIDEO_EXAMPLE 0 -%define CONFIG_DEMUXING_DECODING_EXAMPLE 0 +%define CONFIG_DEMUX_DECODE_EXAMPLE 0 %define CONFIG_ENCODE_AUDIO_EXAMPLE 0 %define CONFIG_ENCODE_VIDEO_EXAMPLE 0 %define CONFIG_EXTRACT_MVS_EXAMPLE 0 %define CONFIG_FILTER_AUDIO_EXAMPLE 0 -%define CONFIG_FILTERING_AUDIO_EXAMPLE 0 -%define CONFIG_FILTERING_VIDEO_EXAMPLE 0 -%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0 %define CONFIG_HW_DECODE_EXAMPLE 0 -%define CONFIG_METADATA_EXAMPLE 0 -%define CONFIG_MUXING_EXAMPLE 0 -%define CONFIG_QSVDEC_EXAMPLE 0 -%define CONFIG_REMUXING_EXAMPLE 0 -%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0 -%define CONFIG_SCALING_VIDEO_EXAMPLE 0 +%define CONFIG_MUX_EXAMPLE 0 +%define CONFIG_QSV_DECODE_EXAMPLE 0 +%define CONFIG_REMUX_EXAMPLE 0 +%define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0 +%define CONFIG_SCALE_VIDEO_EXAMPLE 0 +%define CONFIG_SHOW_METADATA_EXAMPLE 0 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0 -%define CONFIG_TRANSCODING_EXAMPLE 0 +%define CONFIG_TRANSCODE_EXAMPLE 0 %define CONFIG_VAAPI_ENCODE_EXAMPLE 0 %define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0 %define CONFIG_QSV_TRANSCODE_EXAMPLE 0 diff --git a/SMP/config.h b/SMP/config.h index 850ea40f543f0..79c7b1077fbe4 100644 --- a/SMP/config.h +++ b/SMP/config.h @@ -28,7 +28,7 @@ #endif #define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf" #define FFMPEG_LICENSE "GPL version 3 or later" -#define CONFIG_THIS_YEAR 2022 +#define CONFIG_THIS_YEAR 2023 #define FFMPEG_DATADIR "." #define AVCONV_DATADIR "." #if defined(__INTEL_COMPILER) @@ -545,27 +545,27 @@ #define CONFIG_MANPAGES 0 #define CONFIG_PODPAGES 0 #define CONFIG_TXTPAGES 0 +#define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 0 #define CONFIG_AVIO_LIST_DIR_EXAMPLE 0 -#define CONFIG_AVIO_READING_EXAMPLE 0 +#define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 0 #define CONFIG_DECODE_AUDIO_EXAMPLE 0 +#define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0 +#define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0 #define CONFIG_DECODE_VIDEO_EXAMPLE 0 -#define CONFIG_DEMUXING_DECODING_EXAMPLE 0 +#define CONFIG_DEMUX_DECODE_EXAMPLE 0 #define CONFIG_ENCODE_AUDIO_EXAMPLE 0 #define CONFIG_ENCODE_VIDEO_EXAMPLE 0 #define CONFIG_EXTRACT_MVS_EXAMPLE 0 #define CONFIG_FILTER_AUDIO_EXAMPLE 0 -#define CONFIG_FILTERING_AUDIO_EXAMPLE 0 -#define CONFIG_FILTERING_VIDEO_EXAMPLE 0 -#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 0 #define CONFIG_HW_DECODE_EXAMPLE 0 -#define CONFIG_METADATA_EXAMPLE 0 -#define CONFIG_MUXING_EXAMPLE 0 -#define CONFIG_QSVDEC_EXAMPLE 0 -#define CONFIG_REMUXING_EXAMPLE 0 -#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0 -#define CONFIG_SCALING_VIDEO_EXAMPLE 0 +#define CONFIG_MUX_EXAMPLE 0 +#define CONFIG_QSV_DECODE_EXAMPLE 0 +#define CONFIG_REMUX_EXAMPLE 0 +#define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0 +#define CONFIG_SCALE_VIDEO_EXAMPLE 0 +#define CONFIG_SHOW_METADATA_EXAMPLE 0 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0 -#define CONFIG_TRANSCODING_EXAMPLE 0 +#define CONFIG_TRANSCODE_EXAMPLE 0 #define CONFIG_VAAPI_ENCODE_EXAMPLE 0 #define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0 #define CONFIG_QSV_TRANSCODE_EXAMPLE 0 diff --git a/SMP/config_components.h b/SMP/config_components.h index 497aa4cd1f0bf..6da568116f5e3 100644 --- a/SMP/config_components.h +++ b/SMP/config_components.h @@ -41,6 +41,7 @@ #define CONFIG_HEVC_METADATA_BSF 1 #define CONFIG_HEVC_MP4TOANNEXB_BSF 1 #define CONFIG_IMX_DUMP_HEADER_BSF 1 +#define CONFIG_MEDIA100_TO_MJPEGB_BSF 1 #define CONFIG_MJPEG2JPEG_BSF 1 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1 @@ -264,6 +265,7 @@ #define CONFIG_R210_DECODER 1 #define CONFIG_RASC_DECODER 1 #define CONFIG_RAWVIDEO_DECODER 1 +#define CONFIG_RKA_DECODER 1 #define CONFIG_RL2_DECODER 1 #define CONFIG_ROQ_DECODER 1 #define CONFIG_RPZA_DECODER 1 @@ -462,6 +464,7 @@ #define CONFIG_TWINVQ_DECODER 1 #define CONFIG_VMDAUDIO_DECODER 1 #define CONFIG_VORBIS_DECODER 1 +#define CONFIG_WAVARC_DECODER 1 #define CONFIG_WAVPACK_DECODER 1 #define CONFIG_WMALOSSLESS_DECODER 1 #define CONFIG_WMAPRO_DECODER 1 @@ -506,6 +509,7 @@ #define CONFIG_PCM_U32BE_DECODER 1 #define CONFIG_PCM_U32LE_DECODER 1 #define CONFIG_PCM_VIDC_DECODER 1 +#define CONFIG_CBD2_DPCM_DECODER 1 #define CONFIG_DERF_DPCM_DECODER 1 #define CONFIG_GREMLIN_DPCM_DECODER 1 #define CONFIG_INTERPLAY_DPCM_DECODER 1 @@ -513,6 +517,7 @@ #define CONFIG_SDX2_DPCM_DECODER 1 #define CONFIG_SOL_DPCM_DECODER 1 #define CONFIG_XAN_DPCM_DECODER 1 +#define CONFIG_WADY_DPCM_DECODER 1 #define CONFIG_ADPCM_4XM_DECODER 1 #define CONFIG_ADPCM_ADX_DECODER 1 #define CONFIG_ADPCM_AFC_DECODER 1 @@ -562,6 +567,7 @@ #define CONFIG_ADPCM_THP_LE_DECODER 1 #define CONFIG_ADPCM_VIMA_DECODER 1 #define CONFIG_ADPCM_XA_DECODER 1 +#define CONFIG_ADPCM_XMD_DECODER 1 #define CONFIG_ADPCM_YAMAHA_DECODER 1 #define CONFIG_ADPCM_ZORK_DECODER 1 #define CONFIG_SSA_DECODER 1 @@ -632,6 +638,7 @@ #else # define CONFIG_AV1_CUVID_DECODER 0 #endif +#define CONFIG_AV1_MEDIACODEC_DECODER 0 #if CONFIG_LIBMFX # define CONFIG_AV1_QSV_DECODER 1 #else @@ -702,6 +709,8 @@ #else # define CONFIG_VP9_QSV_DECODER 0 #endif +#define CONFIG_VNULL_DECODER 1 +#define CONFIG_ANULL_DECODER 1 #define CONFIG_A64MULTI_ENCODER 1 #define CONFIG_A64MULTI5_ENCODER 1 #define CONFIG_ALIAS_PIX_ENCODER 1 @@ -917,8 +926,17 @@ #define CONFIG_AAC_MF_ENCODER 1 #define CONFIG_AC3_MF_ENCODER 1 #define CONFIG_H263_V4L2M2M_ENCODER 0 -#define CONFIG_AV1_NVENC_ENCODER 0 +#if CONFIG_NVENC +# define CONFIG_AV1_NVENC_ENCODER 1 +#else +# define CONFIG_AV1_NVENC_ENCODER 0 +#endif #define CONFIG_AV1_QSV_ENCODER 0 +#if CONFIG_AMF +# define CONFIG_AV1_AMF_ENCODER 1 +#else +# define CONFIG_AV1_AMF_ENCODER 0 +#endif #define CONFIG_LIBOPENH264_ENCODER 0 #if CONFIG_AMF # define CONFIG_H264_AMF_ENCODER 1 @@ -985,6 +1003,8 @@ #else # define CONFIG_VP9_QSV_ENCODER 0 #endif +#define CONFIG_VNULL_ENCODER 1 +#define CONFIG_ANULL_ENCODER 1 #if defined(NTDDI_WIN10_FE) # define CONFIG_AV1_D3D11VA_HWACCEL 1 #else @@ -1417,6 +1437,7 @@ #define CONFIG_VOLUME_FILTER 1 #define CONFIG_VOLUMEDETECT_FILTER 1 #define CONFIG_AEVALSRC_FILTER 1 +#define CONFIG_AFDELAYSRC_FILTER 1 #define CONFIG_AFIRSRC_FILTER 1 #define CONFIG_ANOISESRC_FILTER 1 #define CONFIG_ANULLSRC_FILTER 1 @@ -1729,6 +1750,7 @@ #define CONFIG_SPP_FILTER 1 #define CONFIG_SR_FILTER 1 #define CONFIG_SSIM_FILTER 1 +#define CONFIG_SSIM360_FILTER 1 #define CONFIG_STEREO3D_FILTER 1 #define CONFIG_STREAMSELECT_FILTER 1 #define CONFIG_SUBTITLES_FILTER 1 @@ -1797,6 +1819,24 @@ #define CONFIG_ZMQ_FILTER 0 #define CONFIG_ZOOMPAN_FILTER 1 #define CONFIG_ZSCALE_FILTER 0 +#define CONFIG_HSTACK_VAAPI_FILTER 0 +#define CONFIG_VSTACK_VAAPI_FILTER 0 +#define CONFIG_XSTACK_VAAPI_FILTER 0 +#if CONFIG_LIBMFX +# define CONFIG_HSTACK_QSV_FILTER 1 +#else +# define CONFIG_HSTACK_QSV_FILTER 0 +#endif +#if CONFIG_LIBMFX +# define CONFIG_VSTACK_QSV_FILTER 1 +#else +# define CONFIG_VSTACK_QSV_FILTER 0 +#endif +#if CONFIG_LIBMFX +# define CONFIG_XSTACK_QSV_FILTER 1 +#else +# define CONFIG_XSTACK_QSV_FILTER 0 +#endif #define CONFIG_ALLRGB_FILTER 1 #define CONFIG_ALLYUV_FILTER 1 #define CONFIG_CELLAUTO_FILTER 1 @@ -2072,6 +2112,7 @@ #define CONFIG_RAWVIDEO_DEMUXER 1 #define CONFIG_REALTEXT_DEMUXER 1 #define CONFIG_REDSPARK_DEMUXER 1 +#define CONFIG_RKA_DEMUXER 1 #define CONFIG_RL2_DEMUXER 1 #define CONFIG_RM_DEMUXER 1 #define CONFIG_ROQ_DEMUXER 1 @@ -2087,6 +2128,7 @@ #define CONFIG_SBG_DEMUXER 1 #define CONFIG_SCC_DEMUXER 1 #define CONFIG_SCD_DEMUXER 1 +#define CONFIG_SDNS_DEMUXER 1 #define CONFIG_SDP_DEMUXER 1 #define CONFIG_SDR2_DEMUXER 1 #define CONFIG_SDS_DEMUXER 1 @@ -2138,6 +2180,8 @@ #define CONFIG_VPLAYER_DEMUXER 1 #define CONFIG_VQF_DEMUXER 1 #define CONFIG_W64_DEMUXER 1 +#define CONFIG_WADY_DEMUXER 1 +#define CONFIG_WAVARC_DEMUXER 1 #define CONFIG_WAV_DEMUXER 1 #define CONFIG_WC3_DEMUXER 1 #define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1 @@ -2150,6 +2194,7 @@ #define CONFIG_WV_DEMUXER 1 #define CONFIG_XA_DEMUXER 1 #define CONFIG_XBIN_DEMUXER 1 +#define CONFIG_XMD_DEMUXER 1 #define CONFIG_XMV_DEMUXER 1 #define CONFIG_XVAG_DEMUXER 1 #define CONFIG_XWMA_DEMUXER 1 @@ -2377,6 +2422,7 @@ #define CONFIG_CONCATF_PROTOCOL 1 #define CONFIG_CRYPTO_PROTOCOL 1 #define CONFIG_DATA_PROTOCOL 1 +#define CONFIG_FD_PROTOCOL 1 #define CONFIG_FFRTMPCRYPT_PROTOCOL 1 #define CONFIG_FFRTMPHTTP_PROTOCOL 1 #define CONFIG_FILE_PROTOCOL 1 @@ -2420,6 +2466,6 @@ #define CONFIG_LIBSSH_PROTOCOL 1 #define CONFIG_LIBSMBCLIENT_PROTOCOL 0 #define CONFIG_LIBZMQ_PROTOCOL 0 -#define CONFIG_IPFS_PROTOCOL 1 -#define CONFIG_IPNS_PROTOCOL 1 +#define CONFIG_IPFS_GATEWAY_PROTOCOL 1 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 1 #endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/SMP/libavcodec.def b/SMP/libavcodec.def index ea8f760aa4ba6..a5ecde6d4242d 100644 --- a/SMP/libavcodec.def +++ b/SMP/libavcodec.def @@ -120,7 +120,6 @@ EXPORTS avcodec_flush_buffers avcodec_free_context avcodec_get_class - avcodec_get_frame_class avcodec_get_hw_config avcodec_get_hw_frames_parameters avcodec_get_name diff --git a/SMP/libavcodec.vcxproj.filters b/SMP/libavcodec.vcxproj.filters index 5c83e90f7b3eb..044505f517267 100644 --- a/SMP/libavcodec.vcxproj.filters +++ b/SMP/libavcodec.vcxproj.filters @@ -157,12 +157,6 @@ Source Files\libavcodec\x86 - - Source Files\libavcodec\x86 - - - Source Files\libavcodec\x86 - Source Files\libavcodec\x86 @@ -317,6 +311,16 @@ Source Files\libavcodec\x86 + + + Source Files\libavcodec\x86 + + + + + Source Files\libavcodec\x86 + + Source Files\libavcodec @@ -909,6 +913,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1698,7 +1705,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -1722,9 +1729,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2019,6 +2023,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2406,6 +2413,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2877,6 +2887,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3177,6 +3190,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3210,9 +3226,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3246,6 +3259,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3276,9 +3292,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3448,6 +3461,16 @@ Source Files\libavcodec\x86 + + + Source Files\libavcodec + + + + + Source Files\libavcodec + + Header Files\libavcodec diff --git a/SMP/libavcodec/log2_tab_wrap.c b/SMP/libavcodec/amfenc_av1_wrap.c similarity index 88% rename from SMP/libavcodec/log2_tab_wrap.c rename to SMP/libavcodec/amfenc_av1_wrap.c index 87ba40d5c09ce..e714acee0de3f 100644 --- a/SMP/libavcodec/log2_tab_wrap.c +++ b/SMP/libavcodec/amfenc_av1_wrap.c @@ -1,4 +1,4 @@ -/** log2_tab.c file wrapper for libavcodec +/** amfenc_av1.c file wrapper for libavcodec * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,6 @@ #include "config.h" #include "config_components.h" -#if CONFIG_SHARED -# include "../../libavcodec/log2_tab.c" +#if CONFIG_AV1_AMF_ENCODER +# include "../../libavcodec/amfenc_av1.c" #endif \ No newline at end of file diff --git a/SMP/libavcodec/bsf_list.c b/SMP/libavcodec/bsf_list.c index 175765346c114..c08d32f8b6397 100644 --- a/SMP/libavcodec/bsf_list.c +++ b/SMP/libavcodec/bsf_list.c @@ -40,6 +40,7 @@ static const FFBitStreamFilter *bitstream_filters[] = { &ff_hevc_metadata_bsf, &ff_hevc_mp4toannexb_bsf, &ff_imx_dump_header_bsf, + &ff_media100_to_mjpegb_bsf, &ff_mjpeg2jpeg_bsf, &ff_mjpega_dump_header_bsf, &ff_mp3_header_decompress_bsf, diff --git a/SMP/libavcodec/codec_list.c b/SMP/libavcodec/codec_list.c index 9044dc5cffb16..b04e8612f8376 100644 --- a/SMP/libavcodec/codec_list.c +++ b/SMP/libavcodec/codec_list.c @@ -210,6 +210,12 @@ static const FFCodec *codec_list[] = { &ff_libxvid_encoder, &ff_aac_mf_encoder, &ff_ac3_mf_encoder, +#if CONFIG_AV1_NVENC_ENCODER + &ff_av1_nvenc_encoder, +#endif +#if CONFIG_AV1_AMF_ENCODER + &ff_av1_amf_encoder, +#endif #if CONFIG_H264_AMF_ENCODER &ff_h264_amf_encoder, #endif @@ -240,6 +246,8 @@ static const FFCodec *codec_list[] = { #if CONFIG_VP9_QSV_ENCODER &ff_vp9_qsv_encoder, #endif + &ff_vnull_encoder, + &ff_anull_encoder, &ff_aasc_decoder, &ff_aic_decoder, &ff_alias_pix_decoder, @@ -419,6 +427,7 @@ static const FFCodec *codec_list[] = { &ff_r210_decoder, &ff_rasc_decoder, &ff_rawvideo_decoder, + &ff_rka_decoder, &ff_rl2_decoder, &ff_roq_decoder, &ff_rpza_decoder, @@ -607,6 +616,7 @@ static const FFCodec *codec_list[] = { &ff_twinvq_decoder, &ff_vmdaudio_decoder, &ff_vorbis_decoder, + &ff_wavarc_decoder, &ff_wavpack_decoder, &ff_wmalossless_decoder, &ff_wmapro_decoder, @@ -651,6 +661,7 @@ static const FFCodec *codec_list[] = { &ff_pcm_u32be_decoder, &ff_pcm_u32le_decoder, &ff_pcm_vidc_decoder, + &ff_cbd2_dpcm_decoder, &ff_derf_dpcm_decoder, &ff_gremlin_dpcm_decoder, &ff_interplay_dpcm_decoder, @@ -658,6 +669,7 @@ static const FFCodec *codec_list[] = { &ff_sdx2_dpcm_decoder, &ff_sol_dpcm_decoder, &ff_xan_dpcm_decoder, + &ff_wady_dpcm_decoder, &ff_adpcm_4xm_decoder, &ff_adpcm_adx_decoder, &ff_adpcm_afc_decoder, @@ -707,6 +719,7 @@ static const FFCodec *codec_list[] = { &ff_adpcm_thp_le_decoder, &ff_adpcm_vima_decoder, &ff_adpcm_xa_decoder, + &ff_adpcm_xmd_decoder, &ff_adpcm_yamaha_decoder, &ff_adpcm_zork_decoder, &ff_ssa_decoder, @@ -783,4 +796,6 @@ static const FFCodec *codec_list[] = { #if CONFIG_VP9_QSV_DECODER &ff_vp9_qsv_decoder, #endif + &ff_vnull_decoder, + &ff_anull_decoder, NULL }; \ No newline at end of file diff --git a/SMP/libavcodec/reverse_wrap.c b/SMP/libavcodec/nvenc_av1_wrap.c similarity index 88% rename from SMP/libavcodec/reverse_wrap.c rename to SMP/libavcodec/nvenc_av1_wrap.c index 031dc0d038399..146fbe6b1cf8f 100644 --- a/SMP/libavcodec/reverse_wrap.c +++ b/SMP/libavcodec/nvenc_av1_wrap.c @@ -1,4 +1,4 @@ -/** reverse.c file wrapper for libavcodec +/** nvenc_av1.c file wrapper for libavcodec * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,6 @@ #include "config.h" #include "config_components.h" -#if CONFIG_SHARED -# include "../../libavcodec/reverse.c" +#if CONFIG_AV1_NVENC_ENCODER +# include "../../libavcodec/nvenc_av1.c" #endif \ No newline at end of file diff --git a/SMP/libavcodec/nvenc_wrap.c b/SMP/libavcodec/nvenc_wrap.c index 859f536dc29e6..b07e179264615 100644 --- a/SMP/libavcodec/nvenc_wrap.c +++ b/SMP/libavcodec/nvenc_wrap.c @@ -21,6 +21,6 @@ #include "config.h" #include "config_components.h" -#if CONFIG_H264_NVENC_ENCODER || CONFIG_HEVC_NVENC_ENCODER +#if CONFIG_AV1_NVENC_ENCODER || CONFIG_H264_NVENC_ENCODER || CONFIG_HEVC_NVENC_ENCODER # include "../../libavcodec/nvenc.c" #endif \ No newline at end of file diff --git a/SMP/libavcodec_files.props b/SMP/libavcodec_files.props index 973d3a635e11a..1bf86926ffb00 100644 --- a/SMP/libavcodec_files.props +++ b/SMP/libavcodec_files.props @@ -53,8 +53,6 @@ - - @@ -107,6 +105,16 @@ + + + true + + + + + true + + @@ -305,6 +313,7 @@ + @@ -568,7 +577,7 @@ - + @@ -576,7 +585,6 @@ - @@ -675,6 +683,7 @@ + @@ -804,6 +813,7 @@ + @@ -961,6 +971,7 @@ + @@ -1061,6 +1072,7 @@ + @@ -1072,7 +1084,6 @@ - @@ -1084,6 +1095,7 @@ + @@ -1094,7 +1106,6 @@ - $(IntDir)\libavcodec_ac3dsp.obj @@ -1262,6 +1273,22 @@ $(IntDir)\libavcodec_x86_mpeg4videodsp.obj + + + true + true + true + true + + + + + true + true + true + true + + diff --git a/SMP/libavcodec_winrt.vcxproj.filters b/SMP/libavcodec_winrt.vcxproj.filters index 5c83e90f7b3eb..044505f517267 100644 --- a/SMP/libavcodec_winrt.vcxproj.filters +++ b/SMP/libavcodec_winrt.vcxproj.filters @@ -157,12 +157,6 @@ Source Files\libavcodec\x86 - - Source Files\libavcodec\x86 - - - Source Files\libavcodec\x86 - Source Files\libavcodec\x86 @@ -317,6 +311,16 @@ Source Files\libavcodec\x86 + + + Source Files\libavcodec\x86 + + + + + Source Files\libavcodec\x86 + + Source Files\libavcodec @@ -909,6 +913,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -1698,7 +1705,7 @@ Source Files\libavcodec - + Source Files\libavcodec @@ -1722,9 +1729,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -2019,6 +2023,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2406,6 +2413,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -2877,6 +2887,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3177,6 +3190,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3210,9 +3226,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3246,6 +3259,9 @@ Source Files\libavcodec + + Source Files\libavcodec + Source Files\libavcodec @@ -3276,9 +3292,6 @@ Source Files\libavcodec - - Source Files\libavcodec - Source Files\libavcodec @@ -3448,6 +3461,16 @@ Source Files\libavcodec\x86 + + + Source Files\libavcodec + + + + + Source Files\libavcodec + + Header Files\libavcodec diff --git a/SMP/libavdevice.def b/SMP/libavdevice.def index 5dadf15f4877d..aeb260002ece3 100644 --- a/SMP/libavdevice.def +++ b/SMP/libavdevice.def @@ -5,8 +5,6 @@ EXPORTS av_output_audio_device_next av_output_video_device_next avdevice_app_to_dev_control_message - avdevice_capabilities_create - avdevice_capabilities_free avdevice_configuration avdevice_dev_to_app_control_message avdevice_free_list_devices @@ -16,5 +14,4 @@ EXPORTS avdevice_list_output_sinks avdevice_register_all avdevice_version - av_device_capabilities DATA av_device_ffversion DATA diff --git a/SMP/libavdevice/outdev_list.c b/SMP/libavdevice/outdev_list.c index 2bda33a4a20a1..44b844a6cf35f 100644 --- a/SMP/libavdevice/outdev_list.c +++ b/SMP/libavdevice/outdev_list.c @@ -20,7 +20,7 @@ */ #include "config.h" #include "config_components.h" -static const AVOutputFormat *outdev_list[] = { +static const FFOutputFormat *outdev_list[] = { #if CONFIG_OPENGL_OUTDEV &ff_opengl_muxer, #endif diff --git a/SMP/libavfilter.def b/SMP/libavfilter.def index 8c596939d6ad2..8b7be526af179 100644 --- a/SMP/libavfilter.def +++ b/SMP/libavfilter.def @@ -1,5 +1,4 @@ EXPORTS - av_abuffersink_params_alloc av_buffersink_get_ch_layout av_buffersink_get_channel_layout av_buffersink_get_channels @@ -15,7 +14,6 @@ EXPORTS av_buffersink_get_time_base av_buffersink_get_type av_buffersink_get_w - av_buffersink_params_alloc av_buffersink_set_frame_size av_buffersrc_add_frame av_buffersrc_add_frame_flags @@ -44,6 +42,13 @@ EXPORTS avfilter_graph_parse_ptr avfilter_graph_queue_command avfilter_graph_request_oldest + avfilter_graph_segment_apply + avfilter_graph_segment_apply_opts + avfilter_graph_segment_create_filters + avfilter_graph_segment_free + avfilter_graph_segment_init + avfilter_graph_segment_link + avfilter_graph_segment_parse avfilter_graph_send_command avfilter_graph_set_auto_convert avfilter_init_dict @@ -54,7 +59,6 @@ EXPORTS avfilter_license avfilter_link avfilter_link_free - avfilter_pad_count avfilter_pad_get_name avfilter_pad_get_type avfilter_process_command diff --git a/SMP/libavfilter.vcxproj.filters b/SMP/libavfilter.vcxproj.filters index a8a43bb31b8bb..ad471790eea35 100644 --- a/SMP/libavfilter.vcxproj.filters +++ b/SMP/libavfilter.vcxproj.filters @@ -534,6 +534,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -978,6 +981,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1095,6 +1101,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1395,22 +1404,16 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter - Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter Source Files\libavfilter - + Source Files\libavfilter @@ -1534,6 +1537,11 @@ Source Files\libavfilter\x86 + + + Source Files\libavfilter + + Header Files\libavfilter diff --git a/SMP/libavfilter/filter_list.c b/SMP/libavfilter/filter_list.c index 1dc643ee5f14b..114a5285c99b8 100644 --- a/SMP/libavfilter/filter_list.c +++ b/SMP/libavfilter/filter_list.c @@ -151,6 +151,7 @@ static const AVFilter *filter_list[] = { &ff_af_volume, &ff_af_volumedetect, &ff_asrc_aevalsrc, + &ff_asrc_afdelaysrc, &ff_asrc_afirsrc, &ff_asrc_anoisesrc, &ff_asrc_anullsrc, @@ -407,6 +408,7 @@ static const AVFilter *filter_list[] = { &ff_vf_spp, &ff_vf_sr, &ff_vf_ssim, + &ff_vf_ssim360, &ff_vf_stereo3d, &ff_vf_streamselect, &ff_vf_subtitles, @@ -456,6 +458,15 @@ static const AVFilter *filter_list[] = { &ff_vf_yadif, &ff_vf_yaepblur, &ff_vf_zoompan, +#if CONFIG_HSTACK_QSV_FILTER + &ff_vf_hstack_qsv, +#endif +#if CONFIG_VSTACK_QSV_FILTER + &ff_vf_vstack_qsv, +#endif +#if CONFIG_XSTACK_QSV_FILTER + &ff_vf_xstack_qsv, +#endif &ff_vsrc_allrgb, &ff_vsrc_allyuv, &ff_vsrc_cellauto, diff --git a/SMP/libavfilter/vf_deinterlace_qsv_wrap.c b/SMP/libavfilter/vf_deinterlace_qsv_wrap.c deleted file mode 100644 index f5b7b27afc29a..0000000000000 --- a/SMP/libavfilter/vf_deinterlace_qsv_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** vf_deinterlace_qsv.c file wrapper for libavfilter - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_DEINTERLACE_QSV_FILTER -# include "../../libavfilter/vf_deinterlace_qsv.c" -#endif \ No newline at end of file diff --git a/SMP/libavfilter/vf_scale_qsv_wrap.c b/SMP/libavfilter/vf_scale_qsv_wrap.c deleted file mode 100644 index 0999d7d5e279c..0000000000000 --- a/SMP/libavfilter/vf_scale_qsv_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** vf_scale_qsv.c file wrapper for libavfilter - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SCALE_QSV_FILTER -# include "../../libavfilter/vf_scale_qsv.c" -#endif \ No newline at end of file diff --git a/SMP/libavfilter/log2_tab_wrap.c b/SMP/libavfilter/vf_stack_qsv_wrap.c similarity index 84% rename from SMP/libavfilter/log2_tab_wrap.c rename to SMP/libavfilter/vf_stack_qsv_wrap.c index c0e92e19e1100..058926e87fc61 100644 --- a/SMP/libavfilter/log2_tab_wrap.c +++ b/SMP/libavfilter/vf_stack_qsv_wrap.c @@ -1,4 +1,4 @@ -/** log2_tab.c file wrapper for libavfilter +/** vf_stack_qsv.c file wrapper for libavfilter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,6 +21,6 @@ #include "config.h" #include "config_components.h" -#if CONFIG_SHARED -# include "../../libavfilter/log2_tab.c" +#if CONFIG_HSTACK_QSV_FILTER || CONFIG_VSTACK_QSV_FILTER || CONFIG_XSTACK_QSV_FILTER +# include "../../libavfilter/vf_stack_qsv.c" #endif \ No newline at end of file diff --git a/SMP/libavfilter/vf_vpp_qsv_wrap.c b/SMP/libavfilter/vf_vpp_qsv_wrap.c index d06588d6cdc88..53ee848fcc833 100644 --- a/SMP/libavfilter/vf_vpp_qsv_wrap.c +++ b/SMP/libavfilter/vf_vpp_qsv_wrap.c @@ -21,6 +21,6 @@ #include "config.h" #include "config_components.h" -#if CONFIG_VPP_QSV_FILTER +#if CONFIG_DEINTERLACE_QSV_FILTER || CONFIG_SCALE_QSV_FILTER || CONFIG_VPP_QSV_FILTER # include "../../libavfilter/vf_vpp_qsv.c" #endif \ No newline at end of file diff --git a/SMP/libavfilter_files.props b/SMP/libavfilter_files.props index b5f914023d1a0..25ab3972850cf 100644 --- a/SMP/libavfilter_files.props +++ b/SMP/libavfilter_files.props @@ -179,6 +179,7 @@ + @@ -327,6 +328,7 @@ + @@ -366,6 +368,7 @@ + @@ -466,12 +469,10 @@ - - - + @@ -587,6 +588,14 @@ $(IntDir)\libavfilter_x86_vf_spp.obj + + + true + true + true + true + + diff --git a/SMP/libavfilter_winrt.vcxproj.filters b/SMP/libavfilter_winrt.vcxproj.filters index a8a43bb31b8bb..ad471790eea35 100644 --- a/SMP/libavfilter_winrt.vcxproj.filters +++ b/SMP/libavfilter_winrt.vcxproj.filters @@ -534,6 +534,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -978,6 +981,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1095,6 +1101,9 @@ Source Files\libavfilter + + Source Files\libavfilter + Source Files\libavfilter @@ -1395,22 +1404,16 @@ Source Files\libavfilter\x86 - - Source Files\libavfilter - Source Files\libavfilter - - Source Files\libavfilter - Source Files\libavfilter Source Files\libavfilter - + Source Files\libavfilter @@ -1534,6 +1537,11 @@ Source Files\libavfilter\x86 + + + Source Files\libavfilter + + Header Files\libavfilter diff --git a/SMP/libavformat.vcxproj.filters b/SMP/libavformat.vcxproj.filters index 03585c8c46f6e..362fe67d3a41d 100644 --- a/SMP/libavformat.vcxproj.filters +++ b/SMP/libavformat.vcxproj.filters @@ -1081,6 +1081,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1201,6 +1204,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1393,6 +1399,12 @@ Source Files\libavformat + + Source Files\libavformat + + + Source Files\libavformat + Source Files\libavformat @@ -1444,6 +1456,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1570,28 +1585,44 @@ Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat diff --git a/SMP/libavformat/ac3_channel_layout_tab_wrap.c b/SMP/libavformat/ac3_channel_layout_tab_wrap.c deleted file mode 100644 index 3b30898b384c2..0000000000000 --- a/SMP/libavformat/ac3_channel_layout_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** ac3_channel_layout_tab.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/ac3_channel_layout_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/dca_sample_rate_tab_wrap.c b/SMP/libavformat/dca_sample_rate_tab_wrap.c deleted file mode 100644 index b2d0f1a997cc4..0000000000000 --- a/SMP/libavformat/dca_sample_rate_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** dca_sample_rate_tab.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/dca_sample_rate_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/demuxer_list.c b/SMP/libavformat/demuxer_list.c index d0613ab5e442c..3300ba4300b8f 100644 --- a/SMP/libavformat/demuxer_list.c +++ b/SMP/libavformat/demuxer_list.c @@ -242,6 +242,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_rawvideo_demuxer, &ff_realtext_demuxer, &ff_redspark_demuxer, + &ff_rka_demuxer, &ff_rl2_demuxer, &ff_rm_demuxer, &ff_roq_demuxer, @@ -257,6 +258,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_sbg_demuxer, &ff_scc_demuxer, &ff_scd_demuxer, + &ff_sdns_demuxer, &ff_sdp_demuxer, &ff_sdr2_demuxer, &ff_sds_demuxer, @@ -308,6 +310,8 @@ static const AVInputFormat *demuxer_list[] = { &ff_vplayer_demuxer, &ff_vqf_demuxer, &ff_w64_demuxer, + &ff_wady_demuxer, + &ff_wavarc_demuxer, &ff_wav_demuxer, &ff_wc3_demuxer, &ff_webm_dash_manifest_demuxer, @@ -320,6 +324,7 @@ static const AVInputFormat *demuxer_list[] = { &ff_wv_demuxer, &ff_xa_demuxer, &ff_xbin_demuxer, + &ff_xmd_demuxer, &ff_xmv_demuxer, &ff_xvag_demuxer, &ff_xwma_demuxer, diff --git a/SMP/libavformat/golomb_tab_wrap.c b/SMP/libavformat/golomb_tab_wrap.c deleted file mode 100644 index 380bf28ef9d6a..0000000000000 --- a/SMP/libavformat/golomb_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** golomb_tab.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/golomb_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/jpegtables_wrap.c b/SMP/libavformat/jpegtables_wrap.c deleted file mode 100644 index 6fd44d211b803..0000000000000 --- a/SMP/libavformat/jpegtables_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** jpegtables.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/jpegtables.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/log2_tab_wrap.c b/SMP/libavformat/log2_tab_wrap.c deleted file mode 100644 index 84eb4c734b853..0000000000000 --- a/SMP/libavformat/log2_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** log2_tab.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/log2_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/mpeg4audio_sample_rates_wrap.c b/SMP/libavformat/mpeg4audio_sample_rates_wrap.c deleted file mode 100644 index 1e020556d67c4..0000000000000 --- a/SMP/libavformat/mpeg4audio_sample_rates_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** mpeg4audio_sample_rates.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/mpeg4audio_sample_rates.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/mpegaudiotabs_wrap.c b/SMP/libavformat/mpegaudiotabs_wrap.c deleted file mode 100644 index d0c858fde2d59..0000000000000 --- a/SMP/libavformat/mpegaudiotabs_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** mpegaudiotabs.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/mpegaudiotabs.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat/muxer_list.c b/SMP/libavformat/muxer_list.c index a5015f11ee233..14ca806e2bec1 100644 --- a/SMP/libavformat/muxer_list.c +++ b/SMP/libavformat/muxer_list.c @@ -20,7 +20,7 @@ */ #include "config.h" #include "config_components.h" -static const AVOutputFormat *muxer_list[] = { +static const FFOutputFormat *muxer_list[] = { &ff_a64_muxer, &ff_ac3_muxer, &ff_adts_muxer, diff --git a/SMP/libavformat/protocol_list.c b/SMP/libavformat/protocol_list.c index 69a3e3e9de1c3..2fa2854e30c4f 100644 --- a/SMP/libavformat/protocol_list.c +++ b/SMP/libavformat/protocol_list.c @@ -28,6 +28,7 @@ static const URLProtocol *url_protocols[] = { &ff_concatf_protocol, &ff_crypto_protocol, &ff_data_protocol, + &ff_fd_protocol, &ff_ffrtmpcrypt_protocol, &ff_ffrtmphttp_protocol, &ff_file_protocol, @@ -59,6 +60,6 @@ static const URLProtocol *url_protocols[] = { &ff_udp_protocol, &ff_udplite_protocol, &ff_libssh_protocol, - &ff_ipfs_protocol, - &ff_ipns_protocol, + &ff_ipfs_gateway_protocol, + &ff_ipns_gateway_protocol, NULL }; \ No newline at end of file diff --git a/SMP/libavformat/to_upper4_wrap.c b/SMP/libavformat/to_upper4_wrap.c deleted file mode 100644 index abc23c528c609..0000000000000 --- a/SMP/libavformat/to_upper4_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** to_upper4.c file wrapper for libavformat - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libavformat/to_upper4.c" -#endif \ No newline at end of file diff --git a/SMP/libavformat_files.props b/SMP/libavformat_files.props index 5fb868024e789..884ecae101391 100644 --- a/SMP/libavformat_files.props +++ b/SMP/libavformat_files.props @@ -362,6 +362,7 @@ + @@ -402,6 +403,7 @@ + @@ -466,6 +468,8 @@ + + @@ -483,6 +487,7 @@ + @@ -525,14 +530,70 @@ - - - - - - - - + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + + + + + true + true + true + true + diff --git a/SMP/libavformat_winrt.vcxproj.filters b/SMP/libavformat_winrt.vcxproj.filters index 03585c8c46f6e..362fe67d3a41d 100644 --- a/SMP/libavformat_winrt.vcxproj.filters +++ b/SMP/libavformat_winrt.vcxproj.filters @@ -1081,6 +1081,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1201,6 +1204,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1393,6 +1399,12 @@ Source Files\libavformat + + Source Files\libavformat + + + Source Files\libavformat + Source Files\libavformat @@ -1444,6 +1456,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat @@ -1570,28 +1585,44 @@ Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat - + + + Source Files\libavformat diff --git a/SMP/libavutil.def b/SMP/libavutil.def index f8d5d4bf1d0b1..4322e37987873 100644 --- a/SMP/libavutil.def +++ b/SMP/libavutil.def @@ -15,6 +15,8 @@ EXPORTS av_aes_ctr_set_iv av_aes_ctr_set_random_iv av_aes_init + av_ambient_viewing_environment_alloc + av_ambient_viewing_environment_create_side_data av_append_path_component av_asprintf av_assert0_fpu @@ -117,11 +119,12 @@ EXPORTS av_crc av_crc_get_table av_crc_init + av_csp_approximate_trc_gamma av_csp_luma_coeffs_from_avcsp av_csp_primaries_desc_from_id av_csp_primaries_id_from_desc + av_csp_trc_func_from_id av_d2q - av_d2str av_default_get_category av_default_item_name av_des_alloc @@ -244,7 +247,6 @@ EXPORTS av_get_channel_layout_nb_channels av_get_channel_layout_string av_get_channel_name - av_get_colorspace_name av_get_cpu_flags av_get_default_channel_layout av_get_extended_channel_layout @@ -342,7 +344,6 @@ EXPORTS av_malloc av_malloc_array av_mallocz - av_mallocz_array av_mastering_display_metadata_alloc av_mastering_display_metadata_create_side_data av_match_list @@ -553,8 +554,6 @@ EXPORTS avpriv_dict_set_timestamp avpriv_emms_asm avpriv_float_dsp_alloc - avpriv_get_gamma_from_trc - avpriv_get_trc_function_from_trc avpriv_init_lls avpriv_report_missing_feature avpriv_request_sample diff --git a/SMP/libavutil.vcxproj b/SMP/libavutil.vcxproj index 5dd9da082083a..277d17ad79f8b 100644 --- a/SMP/libavutil.vcxproj +++ b/SMP/libavutil.vcxproj @@ -29,6 +29,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -173,6 +174,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -318,6 +320,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -463,6 +466,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -607,6 +611,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -751,6 +756,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -896,6 +902,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1041,6 +1048,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1186,6 +1194,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1331,6 +1340,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil diff --git a/SMP/libavutil.vcxproj.filters b/SMP/libavutil.vcxproj.filters index b5b7d31eec34f..3b6e6ab30cec4 100644 --- a/SMP/libavutil.vcxproj.filters +++ b/SMP/libavutil.vcxproj.filters @@ -75,6 +75,9 @@ Source Files\libavutil + + Source Files\libavutil + Source Files\libavutil @@ -105,9 +108,6 @@ Source Files\libavutil - - Source Files\libavutil - Source Files\libavutil @@ -368,6 +368,9 @@ Header Files\libavutil + + Header Files\libavutil + Header Files\libavutil diff --git a/SMP/libavutil_files.props b/SMP/libavutil_files.props index 95bdf2d74b6c8..43fbfc2ac1f32 100644 --- a/SMP/libavutil_files.props +++ b/SMP/libavutil_files.props @@ -25,6 +25,7 @@ + @@ -35,7 +36,6 @@ - @@ -138,6 +138,7 @@ + diff --git a/SMP/libavutil_winrt.vcxproj b/SMP/libavutil_winrt.vcxproj index b3dde3d9353d8..ce51cc34aba17 100644 --- a/SMP/libavutil_winrt.vcxproj +++ b/SMP/libavutil_winrt.vcxproj @@ -29,6 +29,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -173,6 +174,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -318,6 +320,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -463,6 +466,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -607,6 +611,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -751,6 +756,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -896,6 +902,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1041,6 +1048,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1186,6 +1194,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil @@ -1331,6 +1340,7 @@ mkdir "$(OutDir)"\include\libavutil copy ..\libavutil\adler32.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes.h "$(OutDir)"\include\libavutil copy ..\libavutil\aes_ctr.h "$(OutDir)"\include\libavutil +copy ..\libavutil\ambient_viewing_environment.h "$(OutDir)"\include\libavutil copy ..\libavutil\attributes.h "$(OutDir)"\include\libavutil copy ..\libavutil\audio_fifo.h "$(OutDir)"\include\libavutil copy ..\libavutil\avassert.h "$(OutDir)"\include\libavutil diff --git a/SMP/libavutil_winrt.vcxproj.filters b/SMP/libavutil_winrt.vcxproj.filters index b5b7d31eec34f..3b6e6ab30cec4 100644 --- a/SMP/libavutil_winrt.vcxproj.filters +++ b/SMP/libavutil_winrt.vcxproj.filters @@ -75,6 +75,9 @@ Source Files\libavutil + + Source Files\libavutil + Source Files\libavutil @@ -105,9 +108,6 @@ Source Files\libavutil - - Source Files\libavutil - Source Files\libavutil @@ -368,6 +368,9 @@ Header Files\libavutil + + Header Files\libavutil + Header Files\libavutil diff --git a/SMP/libswresample.vcxproj.filters b/SMP/libswresample.vcxproj.filters index bb93c89e9b30d..871943e8681b1 100644 --- a/SMP/libswresample.vcxproj.filters +++ b/SMP/libswresample.vcxproj.filters @@ -78,9 +78,6 @@ Source Files\libswresample\x86 - - Source Files\libswresample - Source Files\libswresample @@ -88,6 +85,11 @@ Source Files\libswresample + + + Source Files\libswresample + + Header Files\libswresample diff --git a/SMP/libswresample/log2_tab_wrap.c b/SMP/libswresample/log2_tab_wrap.c deleted file mode 100644 index a3e91249fd0dd..0000000000000 --- a/SMP/libswresample/log2_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** log2_tab.c file wrapper for libswresample - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libswresample/log2_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libswresample_files.props b/SMP/libswresample_files.props index 6bc6a08f0e4c3..de66ed9c9b710 100644 --- a/SMP/libswresample_files.props +++ b/SMP/libswresample_files.props @@ -28,7 +28,6 @@ - $(IntDir)\libswresample_rematrix.obj @@ -36,6 +35,14 @@ $(IntDir)\libswresample_resample.obj + + + true + true + true + true + + diff --git a/SMP/libswresample_winrt.vcxproj.filters b/SMP/libswresample_winrt.vcxproj.filters index bb93c89e9b30d..871943e8681b1 100644 --- a/SMP/libswresample_winrt.vcxproj.filters +++ b/SMP/libswresample_winrt.vcxproj.filters @@ -78,9 +78,6 @@ Source Files\libswresample\x86 - - Source Files\libswresample - Source Files\libswresample @@ -88,6 +85,11 @@ Source Files\libswresample + + + Source Files\libswresample + + Header Files\libswresample diff --git a/SMP/libswscale.vcxproj.filters b/SMP/libswscale.vcxproj.filters index 166cad478412e..9e58fe90a065f 100644 --- a/SMP/libswscale.vcxproj.filters +++ b/SMP/libswscale.vcxproj.filters @@ -102,9 +102,6 @@ Source Files\libswscale\x86 - - Source Files\libswscale - Source Files\libswscale @@ -124,6 +121,11 @@ Source Files\libswscale\x86 + + + Source Files\libswscale + + Header Files\libswscale diff --git a/SMP/libswscale/log2_tab_wrap.c b/SMP/libswscale/log2_tab_wrap.c deleted file mode 100644 index 1e4bd4fccc642..0000000000000 --- a/SMP/libswscale/log2_tab_wrap.c +++ /dev/null @@ -1,26 +0,0 @@ -/** log2_tab.c file wrapper for libswscale - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "config.h" -#include "config_components.h" -#if CONFIG_SHARED -# include "../../libswscale/log2_tab.c" -#endif \ No newline at end of file diff --git a/SMP/libswscale_files.props b/SMP/libswscale_files.props index e507a032adb98..90212f0b04779 100644 --- a/SMP/libswscale_files.props +++ b/SMP/libswscale_files.props @@ -36,7 +36,6 @@ - $(IntDir)\libswscale_input.obj @@ -54,6 +53,14 @@ $(IntDir)\libswscale_x86_yuv2rgb.obj + + + true + true + true + true + + diff --git a/SMP/libswscale_winrt.vcxproj.filters b/SMP/libswscale_winrt.vcxproj.filters index 166cad478412e..9e58fe90a065f 100644 --- a/SMP/libswscale_winrt.vcxproj.filters +++ b/SMP/libswscale_winrt.vcxproj.filters @@ -102,9 +102,6 @@ Source Files\libswscale\x86 - - Source Files\libswscale - Source Files\libswscale @@ -124,6 +121,11 @@ Source Files\libswscale\x86 + + + Source Files\libswscale + + Header Files\libswscale diff --git a/SMP/project_get_dependencies.bat b/SMP/project_get_dependencies.bat index ec1bb713eeba5..b7d1e6e2b4508 100644 --- a/SMP/project_get_dependencies.bat +++ b/SMP/project_get_dependencies.bat @@ -104,7 +104,7 @@ IF EXIST "%REPONAME%" ( REM Once updated the repo needs to be reset to correct the local line endings cd %REPONAME% git config --local core.autocrlf false - git rm --cached -r . --quiet + git rm --cached --ignore-unmatch -r . --quiet git reset --hard --quiet cd ..\ ) @@ -185,4 +185,5 @@ ECHO %CMDCMDLINE% | FINDSTR /L %COMSPEC% >NUL 2>&1 IF %ERRORLEVEL% == 0 IF "%~1"=="" PAUSE :return -EXIT /B %ERROR% \ No newline at end of file +EXIT /B %ERROR% +