提交 be90ea92 编写于 作者: M Matt Oliver

project: Update for recent upstream merge.

上级 6a50788e
......@@ -124,6 +124,22 @@ before_build:
- ps: (New-Object Net.WebClient).DownloadFile('http://www.opengl.org/registry/api/GL/glext.h', "$env:APPVEYOR_BUILD_FOLDER\..\prebuilt\include\gl\glext.h")
- ps: (New-Object Net.WebClient).DownloadFile('http://www.opengl.org/registry/api/GL/wglext.h', "$env:APPVEYOR_BUILD_FOLDER\..\prebuilt\include\gl\wglext.h")
# Download required ffnvcodec headers
- ps: (New-Object Net.WebClient).DownloadFile('https://github.com/FFmpeg/nv-codec-headers/archive/master.zip', "$pwd\ffnvcodec.zip")
- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\ffnvcodec.zip", "$pwd\TempffnvcodecUnpack")
- cmd: mkdir "%APPVEYOR_BUILD_FOLDER%\..\prebuilt\include\ffnvcodec" >NUL 2>&1
- cmd: copy ".\TempffnvcodecUnpack\nv-codec-headers-master\include\ffnvcodec\*.h" "%APPVEYOR_BUILD_FOLDER%\..\prebuilt\include\ffnvcodec\"
# Download required AMF headers
- ps: Invoke-RestMethod -Uri https://api.github.com/repos/GPUOpen-LibrariesAndSDKs/AMF/releases/latest > latest.json
- cmd: for /f "tokens=* USEBACKQ" %%F in (`TYPE latest.json ^| FINDSTR /B "tag_name"`) do set TAG=%%F
- cmd: for /f "tokens=2 delims={{':'}} " %%F in ("%TAG%") do set TAG=%%F
- ps: (New-Object Net.WebClient).DownloadFile("https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/$env:TAG.zip", "$pwd\AMF.zip")
- ps: Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\AMF.zip", "$pwd\TempAMFUnpack")
- cmd: for /f "tokens=*" %%G IN ('dir amf /ad /s /b') do set FOLDER=%%G
- cmd: mkdir "%APPVEYOR_BUILD_FOLDER%\..\prebuilt\include\AMF" >NUL 2>&1
- cmd: xcopy /s /y /q "%FOLDER%\public\include" "%APPVEYOR_BUILD_FOLDER%\..\prebuilt\include\AMF"
build:
project: build.vcxproj
parallel: true
......
......@@ -521,15 +521,16 @@
%define CONFIG_MMAL 0
%define CONFIG_OMX 0
%define CONFIG_OPENCL 0
%define CONFIG_AMF 0
%define CONFIG_AMF 1
%define CONFIG_AUDIOTOOLBOX 0
%define CONFIG_CRYSTALHD 0
%define CONFIG_CUDA 0
%define CONFIG_CUVID 0
%define CONFIG_CUDA 1
%define CONFIG_CUVID 1
%define CONFIG_D3D11VA 1
%define CONFIG_DXVA2 1
%define CONFIG_NVDEC 0
%define CONFIG_NVENC 0
%define CONFIG_FFNVCODEC 1
%define CONFIG_NVDEC 1
%define CONFIG_NVENC 1
%define CONFIG_VAAPI 0
%define CONFIG_VDPAU 0
%define CONFIG_VIDEOTOOLBOX 0
......@@ -1029,6 +1030,7 @@
%define CONFIG_RA_144_DECODER 1
%define CONFIG_RA_288_DECODER 1
%define CONFIG_RALF_DECODER 1
%define CONFIG_SBC_DECODER 1
%define CONFIG_SHORTEN_DECODER 1
%define CONFIG_SIPR_DECODER 1
%define CONFIG_SMACKAUD_DECODER 1
......@@ -1186,19 +1188,19 @@
%define CONFIG_XBIN_DECODER 1
%define CONFIG_IDF_DECODER 1
%define CONFIG_LIBOPENH264_DECODER 0
%define CONFIG_H264_CUVID_DECODER 0
%define CONFIG_HEVC_CUVID_DECODER 0
%define CONFIG_H264_CUVID_DECODER 1
%define CONFIG_HEVC_CUVID_DECODER 1
%define CONFIG_HEVC_MEDIACODEC_DECODER 0
%define CONFIG_MJPEG_CUVID_DECODER 0
%define CONFIG_MPEG1_CUVID_DECODER 0
%define CONFIG_MPEG2_CUVID_DECODER 0
%define CONFIG_MPEG4_CUVID_DECODER 0
%define CONFIG_MJPEG_CUVID_DECODER 1
%define CONFIG_MPEG1_CUVID_DECODER 1
%define CONFIG_MPEG2_CUVID_DECODER 1
%define CONFIG_MPEG4_CUVID_DECODER 1
%define CONFIG_MPEG4_MEDIACODEC_DECODER 0
%define CONFIG_VC1_CUVID_DECODER 0
%define CONFIG_VP8_CUVID_DECODER 0
%define CONFIG_VC1_CUVID_DECODER 1
%define CONFIG_VP8_CUVID_DECODER 1
%define CONFIG_VP8_MEDIACODEC_DECODER 0
%define CONFIG_VP8_QSV_DECODER 1
%define CONFIG_VP9_CUVID_DECODER 0
%define CONFIG_VP9_CUVID_DECODER 1
%define CONFIG_VP9_MEDIACODEC_DECODER 0
%define CONFIG_A64MULTI_ENCODER 1
%define CONFIG_A64MULTI5_ENCODER 1
......@@ -1296,6 +1298,7 @@
%define CONFIG_NELLYMOSER_ENCODER 1
%define CONFIG_OPUS_ENCODER 1
%define CONFIG_RA_144_ENCODER 1
%define CONFIG_SBC_ENCODER 1
%define CONFIG_SONIC_ENCODER 1
%define CONFIG_SONIC_LS_ENCODER 1
%define CONFIG_TRUEHD_ENCODER 1
......@@ -1385,18 +1388,18 @@
%define CONFIG_LIBXVID_ENCODER 1
%define CONFIG_H263_V4L2M2M_ENCODER 0
%define CONFIG_LIBOPENH264_ENCODER 0
%define CONFIG_H264_AMF_ENCODER 0
%define CONFIG_H264_NVENC_ENCODER 0
%define CONFIG_H264_AMF_ENCODER 1
%define CONFIG_H264_NVENC_ENCODER 1
%define CONFIG_H264_OMX_ENCODER 0
%define CONFIG_H264_QSV_ENCODER 1
%define CONFIG_H264_V4L2M2M_ENCODER 0
%define CONFIG_H264_VAAPI_ENCODER 0
%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
%define CONFIG_NVENC_ENCODER 0
%define CONFIG_NVENC_H264_ENCODER 0
%define CONFIG_NVENC_HEVC_ENCODER 0
%define CONFIG_HEVC_AMF_ENCODER 0
%define CONFIG_HEVC_NVENC_ENCODER 0
%define CONFIG_NVENC_ENCODER 1
%define CONFIG_NVENC_H264_ENCODER 1
%define CONFIG_NVENC_HEVC_ENCODER 1
%define CONFIG_HEVC_AMF_ENCODER 1
%define CONFIG_HEVC_NVENC_ENCODER 1
%define CONFIG_HEVC_QSV_ENCODER 1
%define CONFIG_HEVC_V4L2M2M_ENCODER 0
%define CONFIG_HEVC_VAAPI_ENCODER 0
......@@ -1415,52 +1418,52 @@
%define CONFIG_H264_D3D11VA_HWACCEL 1
%define CONFIG_H264_D3D11VA2_HWACCEL 1
%define CONFIG_H264_DXVA2_HWACCEL 1
%define CONFIG_H264_NVDEC_HWACCEL 0
%define CONFIG_H264_NVDEC_HWACCEL 1
%define CONFIG_H264_VAAPI_HWACCEL 0
%define CONFIG_H264_VDPAU_HWACCEL 0
%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_HEVC_D3D11VA_HWACCEL 1
%define CONFIG_HEVC_D3D11VA2_HWACCEL 1
%define CONFIG_HEVC_DXVA2_HWACCEL 1
%define CONFIG_HEVC_NVDEC_HWACCEL 0
%define CONFIG_HEVC_NVDEC_HWACCEL 1
%define CONFIG_HEVC_VAAPI_HWACCEL 0
%define CONFIG_HEVC_VDPAU_HWACCEL 0
%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_MJPEG_NVDEC_HWACCEL 0
%define CONFIG_MJPEG_NVDEC_HWACCEL 1
%define CONFIG_MJPEG_VAAPI_HWACCEL 0
%define CONFIG_MPEG1_NVDEC_HWACCEL 0
%define CONFIG_MPEG1_NVDEC_HWACCEL 1
%define CONFIG_MPEG1_VDPAU_HWACCEL 0
%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_MPEG1_XVMC_HWACCEL 0
%define CONFIG_MPEG2_D3D11VA_HWACCEL 1
%define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
%define CONFIG_MPEG2_NVDEC_HWACCEL 0
%define CONFIG_MPEG2_NVDEC_HWACCEL 1
%define CONFIG_MPEG2_DXVA2_HWACCEL 1
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_MPEG2_XVMC_HWACCEL 0
%define CONFIG_MPEG4_NVDEC_HWACCEL 0
%define CONFIG_MPEG4_NVDEC_HWACCEL 1
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_VC1_D3D11VA_HWACCEL 1
%define CONFIG_VC1_D3D11VA2_HWACCEL 1
%define CONFIG_VC1_DXVA2_HWACCEL 1
%define CONFIG_VC1_NVDEC_HWACCEL 0
%define CONFIG_VC1_NVDEC_HWACCEL 1
%define CONFIG_VC1_VAAPI_HWACCEL 0
%define CONFIG_VC1_VDPAU_HWACCEL 0
%define CONFIG_VP8_NVDEC_HWACCEL 0
%define CONFIG_VP8_NVDEC_HWACCEL 1
%define CONFIG_VP8_VAAPI_HWACCEL 0
%define CONFIG_VP9_D3D11VA_HWACCEL 1
%define CONFIG_VP9_D3D11VA2_HWACCEL 1
%define CONFIG_VP9_DXVA2_HWACCEL 1
%define CONFIG_VP9_NVDEC_HWACCEL 0
%define CONFIG_VP9_NVDEC_HWACCEL 1
%define CONFIG_VP9_VAAPI_HWACCEL 0
%define CONFIG_WMV3_D3D11VA_HWACCEL 1
%define CONFIG_WMV3_D3D11VA2_HWACCEL 1
%define CONFIG_WMV3_DXVA2_HWACCEL 1
%define CONFIG_WMV3_NVDEC_HWACCEL 0
%define CONFIG_WMV3_NVDEC_HWACCEL 1
%define CONFIG_WMV3_VAAPI_HWACCEL 0
%define CONFIG_WMV3_VDPAU_HWACCEL 0
%define CONFIG_AAC_PARSER 1
......@@ -1495,6 +1498,7 @@
%define CONFIG_PNM_PARSER 1
%define CONFIG_RV30_PARSER 1
%define CONFIG_RV40_PARSER 1
%define CONFIG_SBC_PARSER 1
%define CONFIG_SIPR_PARSER 1
%define CONFIG_TAK_PARSER 1
%define CONFIG_VC1_PARSER 1
......@@ -1726,7 +1730,7 @@
%define CONFIG_HWDOWNLOAD_FILTER 1
%define CONFIG_HWMAP_FILTER 1
%define CONFIG_HWUPLOAD_FILTER 1
%define CONFIG_HWUPLOAD_CUDA_FILTER 0
%define CONFIG_HWUPLOAD_CUDA_FILTER 1
%define CONFIG_HYSTERESIS_FILTER 1
%define CONFIG_IDET_FILTER 1
%define CONFIG_IL_FILTER 1
......@@ -2098,6 +2102,7 @@
%define CONFIG_S337M_DEMUXER 1
%define CONFIG_SAMI_DEMUXER 1
%define CONFIG_SAP_DEMUXER 1
%define CONFIG_SBC_DEMUXER 1
%define CONFIG_SBG_DEMUXER 1
%define CONFIG_SCC_DEMUXER 1
%define CONFIG_SDP_DEMUXER 1
......@@ -2315,6 +2320,7 @@
%define CONFIG_RTP_MPEGTS_MUXER 1
%define CONFIG_RTSP_MUXER 1
%define CONFIG_SAP_MUXER 1
%define CONFIG_SBC_MUXER 1
%define CONFIG_SCC_MUXER 1
%define CONFIG_SEGMENT_MUXER 1
%define CONFIG_STREAM_SEGMENT_MUXER 1
......
......@@ -571,11 +571,11 @@
#define CONFIG_MMAL 0
#define CONFIG_OMX 0
#define CONFIG_OPENCL 0
#define CONFIG_AMF 0
#define CONFIG_AMF 1
#define CONFIG_AUDIOTOOLBOX 0
#define CONFIG_CRYSTALHD 0
#define CONFIG_CUDA 0
#define CONFIG_CUVID 0
#define CONFIG_CUDA 1
#define CONFIG_CUVID 1
#ifdef _WIN32
#include <sdkddkver.h>
#endif
......@@ -585,8 +585,9 @@
# define CONFIG_D3D11VA 0
#endif
#define CONFIG_DXVA2 1
#define CONFIG_NVDEC 0
#define CONFIG_NVENC 0
#define CONFIG_FFNVCODEC 1
#define CONFIG_NVDEC 1
#define CONFIG_NVENC 1
#define CONFIG_VAAPI 0
#define CONFIG_VDPAU 0
#define CONFIG_VIDEOTOOLBOX 0
......@@ -1094,6 +1095,7 @@
#define CONFIG_RA_144_DECODER 1
#define CONFIG_RA_288_DECODER 1
#define CONFIG_RALF_DECODER 1
#define CONFIG_SBC_DECODER 1
#define CONFIG_SHORTEN_DECODER 1
#define CONFIG_SIPR_DECODER 1
#define CONFIG_SMACKAUD_DECODER 1
......@@ -1251,19 +1253,19 @@
#define CONFIG_XBIN_DECODER 1
#define CONFIG_IDF_DECODER 1
#define CONFIG_LIBOPENH264_DECODER 0
#define CONFIG_H264_CUVID_DECODER 0
#define CONFIG_HEVC_CUVID_DECODER 0
#define CONFIG_H264_CUVID_DECODER 1
#define CONFIG_HEVC_CUVID_DECODER 1
#define CONFIG_HEVC_MEDIACODEC_DECODER 0
#define CONFIG_MJPEG_CUVID_DECODER 0
#define CONFIG_MPEG1_CUVID_DECODER 0
#define CONFIG_MPEG2_CUVID_DECODER 0
#define CONFIG_MPEG4_CUVID_DECODER 0
#define CONFIG_MJPEG_CUVID_DECODER 1
#define CONFIG_MPEG1_CUVID_DECODER 1
#define CONFIG_MPEG2_CUVID_DECODER 1
#define CONFIG_MPEG4_CUVID_DECODER 1
#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
#define CONFIG_VC1_CUVID_DECODER 0
#define CONFIG_VP8_CUVID_DECODER 0
#define CONFIG_VC1_CUVID_DECODER 1
#define CONFIG_VP8_CUVID_DECODER 1
#define CONFIG_VP8_MEDIACODEC_DECODER 0
#define CONFIG_VP8_QSV_DECODER 1
#define CONFIG_VP9_CUVID_DECODER 0
#define CONFIG_VP9_CUVID_DECODER 1
#define CONFIG_VP9_MEDIACODEC_DECODER 0
#define CONFIG_A64MULTI_ENCODER 1
#define CONFIG_A64MULTI5_ENCODER 1
......@@ -1361,6 +1363,7 @@
#define CONFIG_NELLYMOSER_ENCODER 1
#define CONFIG_OPUS_ENCODER 1
#define CONFIG_RA_144_ENCODER 1
#define CONFIG_SBC_ENCODER 1
#define CONFIG_SONIC_ENCODER 1
#define CONFIG_SONIC_LS_ENCODER 1
#define CONFIG_TRUEHD_ENCODER 1
......@@ -1450,18 +1453,18 @@
#define CONFIG_LIBXVID_ENCODER 1
#define CONFIG_H263_V4L2M2M_ENCODER 0
#define CONFIG_LIBOPENH264_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 0
#define CONFIG_H264_NVENC_ENCODER 0
#define CONFIG_H264_AMF_ENCODER 1
#define CONFIG_H264_NVENC_ENCODER 1
#define CONFIG_H264_OMX_ENCODER 0
#define CONFIG_H264_QSV_ENCODER 1
#define CONFIG_H264_V4L2M2M_ENCODER 0
#define CONFIG_H264_VAAPI_ENCODER 0
#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
#define CONFIG_NVENC_ENCODER 0
#define CONFIG_NVENC_H264_ENCODER 0
#define CONFIG_NVENC_HEVC_ENCODER 0
#define CONFIG_HEVC_AMF_ENCODER 0
#define CONFIG_HEVC_NVENC_ENCODER 0
#define CONFIG_NVENC_ENCODER 1
#define CONFIG_NVENC_H264_ENCODER 1
#define CONFIG_NVENC_HEVC_ENCODER 1
#define CONFIG_HEVC_AMF_ENCODER 1
#define CONFIG_HEVC_NVENC_ENCODER 1
#define CONFIG_HEVC_QSV_ENCODER 1
#define CONFIG_HEVC_V4L2M2M_ENCODER 0
#define CONFIG_HEVC_VAAPI_ENCODER 0
......@@ -1480,42 +1483,42 @@
#define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
#define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
#define CONFIG_H264_DXVA2_HWACCEL 1
#define CONFIG_H264_NVDEC_HWACCEL 0
#define CONFIG_H264_NVDEC_HWACCEL 1
#define CONFIG_H264_VAAPI_HWACCEL 0
#define CONFIG_H264_VDPAU_HWACCEL 0
#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
#define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
#define CONFIG_HEVC_DXVA2_HWACCEL 1
#define CONFIG_HEVC_NVDEC_HWACCEL 0
#define CONFIG_HEVC_NVDEC_HWACCEL 1
#define CONFIG_HEVC_VAAPI_HWACCEL 0
#define CONFIG_HEVC_VDPAU_HWACCEL 0
#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_MJPEG_NVDEC_HWACCEL 0
#define CONFIG_MJPEG_NVDEC_HWACCEL 1
#define CONFIG_MJPEG_VAAPI_HWACCEL 0
#define CONFIG_MPEG1_NVDEC_HWACCEL 0
#define CONFIG_MPEG1_NVDEC_HWACCEL 1
#define CONFIG_MPEG1_VDPAU_HWACCEL 0
#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_MPEG1_XVMC_HWACCEL 0
#define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
#define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
#define CONFIG_MPEG2_NVDEC_HWACCEL 0
#define CONFIG_MPEG2_NVDEC_HWACCEL 1
#define CONFIG_MPEG2_DXVA2_HWACCEL 1
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_MPEG2_XVMC_HWACCEL 0
#define CONFIG_MPEG4_NVDEC_HWACCEL 0
#define CONFIG_MPEG4_NVDEC_HWACCEL 1
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
#define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
#define CONFIG_VC1_DXVA2_HWACCEL 1
#define CONFIG_VC1_NVDEC_HWACCEL 0
#define CONFIG_VC1_NVDEC_HWACCEL 1
#define CONFIG_VC1_VAAPI_HWACCEL 0
#define CONFIG_VC1_VDPAU_HWACCEL 0
#define CONFIG_VP8_NVDEC_HWACCEL 0
#define CONFIG_VP8_NVDEC_HWACCEL 1
#define CONFIG_VP8_VAAPI_HWACCEL 0
#ifdef _WIN32
#include <sdkddkver.h>
......@@ -1541,12 +1544,12 @@
#else
# define CONFIG_VP9_DXVA2_HWACCEL 0
#endif
#define CONFIG_VP9_NVDEC_HWACCEL 0
#define CONFIG_VP9_NVDEC_HWACCEL 1
#define CONFIG_VP9_VAAPI_HWACCEL 0
#define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
#define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
#define CONFIG_WMV3_DXVA2_HWACCEL 1
#define CONFIG_WMV3_NVDEC_HWACCEL 0
#define CONFIG_WMV3_NVDEC_HWACCEL 1
#define CONFIG_WMV3_VAAPI_HWACCEL 0
#define CONFIG_WMV3_VDPAU_HWACCEL 0
#define CONFIG_AAC_PARSER 1
......@@ -1581,6 +1584,7 @@
#define CONFIG_PNM_PARSER 1
#define CONFIG_RV30_PARSER 1
#define CONFIG_RV40_PARSER 1
#define CONFIG_SBC_PARSER 1
#define CONFIG_SIPR_PARSER 1
#define CONFIG_TAK_PARSER 1
#define CONFIG_VC1_PARSER 1
......@@ -1812,7 +1816,7 @@
#define CONFIG_HWDOWNLOAD_FILTER 1
#define CONFIG_HWMAP_FILTER 1
#define CONFIG_HWUPLOAD_FILTER 1
#define CONFIG_HWUPLOAD_CUDA_FILTER 0
#define CONFIG_HWUPLOAD_CUDA_FILTER 1
#define CONFIG_HYSTERESIS_FILTER 1
#define CONFIG_IDET_FILTER 1
#define CONFIG_IL_FILTER 1
......@@ -2184,6 +2188,7 @@
#define CONFIG_S337M_DEMUXER 1
#define CONFIG_SAMI_DEMUXER 1
#define CONFIG_SAP_DEMUXER 1
#define CONFIG_SBC_DEMUXER 1
#define CONFIG_SBG_DEMUXER 1
#define CONFIG_SCC_DEMUXER 1
#define CONFIG_SDP_DEMUXER 1
......@@ -2401,6 +2406,7 @@
#define CONFIG_RTP_MPEGTS_MUXER 1
#define CONFIG_RTSP_MUXER 1
#define CONFIG_SAP_MUXER 1
#define CONFIG_SBC_MUXER 1
#define CONFIG_SCC_MUXER 1
#define CONFIG_SEGMENT_MUXER 1
#define CONFIG_STREAM_SEGMENT_MUXER 1
......
......@@ -38,6 +38,7 @@
<ClCompile Include="..\fftools\ffmpeg_opt.c" />
<ClCompile Include="..\fftools\ffmpeg_filter.c" />
<ClCompile Include="..\fftools\ffmpeg_hw.c" />
<ClCompile Include="..\fftools\ffmpeg_cuvid.c" />
<ClCompile Include="..\fftools\ffmpeg_qsv.c" />
<ClCompile Include="..\fftools\cmdutils.c" />
<ClCompile Include="..\fftools\ffmpeg.c" />
......
......@@ -30,6 +30,9 @@
<ClCompile Include="..\fftools\ffmpeg_hw.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
<ClCompile Include="..\fftools\ffmpeg_cuvid.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
<ClCompile Include="..\fftools\ffmpeg_qsv.c">
<Filter>Source Files\fftools</Filter>
</ClCompile>
......
......@@ -141,6 +141,7 @@
<NASM Include="..\libavcodec\x86\xvididct.asm" />
<NASM Include="..\libavcodec\x86\proresdsp.asm" />
<NASM Include="..\libavcodec\x86\rv40dsp.asm" />
<NASM Include="..\libavcodec\x86\sbcdsp.asm" />
<NASM Include="..\libavcodec\x86\svq1enc.asm" />
<NASM Include="..\libavcodec\x86\takdsp.asm" />
<NASM Include="..\libavcodec\x86\ttadsp.asm" />
......@@ -196,6 +197,7 @@
<ClCompile Include="..\libavcodec\ac3tab.c" />
<ClCompile Include="..\libavcodec\adts_header.c" />
<ClCompile Include="..\libavcodec\mpeg4audio.c" />
<ClCompile Include="..\libavcodec\amfenc.c" />
<ClCompile Include="..\libavcodec\audio_frame_queue.c" />
<ClCompile Include="..\libavcodec\cabac.c" />
<ClCompile Include="..\libavcodec\cbs.c" />
......@@ -265,6 +267,7 @@
<ClCompile Include="..\libavcodec\motion_est.c" />
<ClCompile Include="..\libavcodec\ratecontrol.c" />
<ClCompile Include="..\libavcodec\mss34dsp.c" />
<ClCompile Include="..\libavcodec\nvenc.c" />
<ClCompile Include="..\libavcodec\qsv.c" />
<ClCompile Include="..\libavcodec\qsvdec.c" />
<ClCompile Include="..\libavcodec\qsvenc.c" />
......@@ -515,6 +518,9 @@
<ClCompile Include="..\libavcodec\h264_sei.c" />
<ClCompile Include="..\libavcodec\h264_slice.c" />
<ClCompile Include="..\libavcodec\h264data.c" />
<ClCompile Include="..\libavcodec\amfenc_h264.c" />
<ClCompile Include="..\libavcodec\cuviddec.c" />
<ClCompile Include="..\libavcodec\nvenc_h264.c" />
<ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
<ClCompile Include="..\libavcodec\qsvenc_h264.c" />
<ClCompile Include="..\libavcodec\hapdec.c" />
......@@ -526,6 +532,8 @@
<ClCompile Include="..\libavcodec\hevcpred.c" />
<ClCompile Include="..\libavcodec\hevcdsp.c" />
<ClCompile Include="..\libavcodec\hevc_filter.c" />
<ClCompile Include="..\libavcodec\amfenc_hevc.c" />
<ClCompile Include="..\libavcodec\nvenc_hevc.c" />
<ClCompile Include="..\libavcodec\qsvenc_hevc.c" />
<ClCompile Include="..\libavcodec\hevc_ps_enc.c" />
<ClCompile Include="..\libavcodec\hnm4video.c" />
......@@ -709,6 +717,11 @@
<ClCompile Include="..\libavcodec\subviewerdec.c" />
<ClCompile Include="..\libavcodec\sunrast.c" />
<ClCompile Include="..\libavcodec\sunrastenc.c" />
<ClCompile Include="..\libavcodec\sbcdec.c" />
<ClCompile Include="..\libavcodec\sbcdec_data.c" />
<ClCompile Include="..\libavcodec\sbc.c" />
<ClCompile Include="..\libavcodec\sbcenc.c" />
<ClCompile Include="..\libavcodec\sbcdsp_data.c" />
<ClCompile Include="..\libavcodec\svq1dec.c" />
<ClCompile Include="..\libavcodec\svq1.c" />
<ClCompile Include="..\libavcodec\svq13.c" />
......@@ -838,10 +851,19 @@
<ClCompile Include="..\libavcodec\adpcmenc.c" />
<ClCompile Include="..\libavcodec\vima.c" />
<ClCompile Include="..\libavcodec\dxva2.c" />
<ClCompile Include="..\libavcodec\nvdec.c" />
<ClCompile Include="..\libavcodec\dxva2_h264.c" />
<ClCompile Include="..\libavcodec\nvdec_h264.c" />
<ClCompile Include="..\libavcodec\dxva2_hevc.c" />
<ClCompile Include="..\libavcodec\nvdec_hevc.c" />
<ClCompile Include="..\libavcodec\nvdec_mjpeg.c" />
<ClCompile Include="..\libavcodec\nvdec_mpeg12.c" />
<ClCompile Include="..\libavcodec\dxva2_mpeg2.c" />
<ClCompile Include="..\libavcodec\nvdec_mpeg4.c" />
<ClCompile Include="..\libavcodec\dxva2_vc1.c" />
<ClCompile Include="..\libavcodec\nvdec_vc1.c" />
<ClCompile Include="..\libavcodec\nvdec_vp8.c" />
<ClCompile Include="..\libavcodec\nvdec_vp9.c" />
<ClCompile Include="..\libavcodec\libilbc.c" />
<ClCompile Include="..\libavcodec\libmp3lame.c" />
<ClCompile Include="..\libavcodec\libopusdec.c" />
......@@ -890,6 +912,7 @@
<ClCompile Include="..\libavcodec\opus_parser.c" />
<ClCompile Include="..\libavcodec\pnm_parser.c" />
<ClCompile Include="..\libavcodec\rv34_parser.c" />
<ClCompile Include="..\libavcodec\sbc_parser.c" />
<ClCompile Include="..\libavcodec\sipr_parser.c" />
<ClCompile Include="..\libavcodec\tak_parser.c" />
<ClCompile Include="..\libavcodec\vc1_parser.c" />
......@@ -978,6 +1001,7 @@
<ClCompile Include="..\libavcodec\x86\xvididct_init.c" />
<ClCompile Include="..\libavcodec\x86\proresdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\rv40dsp_init.c" />
<ClCompile Include="..\libavcodec\x86\sbcdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\svq1enc_init.c" />
<ClCompile Include="..\libavcodec\x86\takdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\ttadsp_init.c" />
......@@ -1110,6 +1134,9 @@
<ClCompile Include="..\libavcodec\rv40dsp.c">
<ObjectFileName>$(IntDir)\libavcodec_rv40dsp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcdsp.c">
<ObjectFileName>$(IntDir)\libavcodec_sbcdsp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\svq1enc.c">
<ObjectFileName>$(IntDir)\libavcodec_svq1enc.obj</ObjectFileName>
</ClCompile>
......
......@@ -250,6 +250,9 @@
<NASM Include="..\libavcodec\x86\rv40dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
<NASM Include="..\libavcodec\x86\sbcdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
<NASM Include="..\libavcodec\x86\svq1enc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</NASM>
......@@ -411,6 +414,9 @@
<ClCompile Include="..\libavcodec\mpeg4audio.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\amfenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\audio_frame_queue.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -618,6 +624,9 @@
<ClCompile Include="..\libavcodec\mss34dsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsv.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1368,6 +1377,15 @@
<ClCompile Include="..\libavcodec\h264data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\amfenc_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\cuviddec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvenc_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsvdec_h2645.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1401,6 +1419,12 @@
<ClCompile Include="..\libavcodec\hevc_filter.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\amfenc_hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvenc_hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsvenc_hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1950,6 +1974,21 @@
<ClCompile Include="..\libavcodec\sunrastenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcdec_data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcdsp_data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\svq1dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2337,18 +2376,45 @@
<ClCompile Include="..\libavcodec\dxva2.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dxva2_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dxva2_hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_hevc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_mjpeg.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_mpeg12.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dxva2_mpeg2.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_mpeg4.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dxva2_vc1.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_vc1.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_vp8.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\nvdec_vp9.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\libilbc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2493,6 +2559,9 @@
<ClCompile Include="..\libavcodec\rv34_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbc_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sipr_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2757,6 +2826,9 @@
<ClCompile Include="..\libavcodec\x86\rv40dsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\sbcdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\svq1enc_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
......@@ -2931,6 +3003,9 @@
<ClCompile Include="..\libavcodec\rv40dsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\sbcdsp.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\svq1enc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......
......@@ -114,6 +114,7 @@ static const AVCodec *codec_list[] = {
&ff_nellymoser_encoder,
&ff_opus_encoder,
&ff_ra_144_encoder,
&ff_sbc_encoder,
&ff_sonic_encoder,
&ff_sonic_ls_encoder,
&ff_truehd_encoder,
......@@ -182,7 +183,14 @@ static const AVCodec *codec_list[] = {
&ff_libx264rgb_encoder,
&ff_libx265_encoder,
&ff_libxvid_encoder,
&ff_h264_amf_encoder,
&ff_h264_nvenc_encoder,
&ff_h264_qsv_encoder,
&ff_nvenc_encoder,
&ff_nvenc_h264_encoder,
&ff_nvenc_hevc_encoder,
&ff_hevc_amf_encoder,
&ff_hevc_nvenc_encoder,
&ff_hevc_qsv_encoder,
&ff_mjpeg_qsv_encoder,
&ff_mpeg2_qsv_encoder,
......@@ -487,6 +495,7 @@ static const AVCodec *codec_list[] = {
&ff_ra_144_decoder,
&ff_ra_288_decoder,
&ff_ralf_decoder,
&ff_sbc_decoder,
&ff_shorten_decoder,
&ff_sipr_decoder,
&ff_smackaud_decoder,
......@@ -618,5 +627,14 @@ static const AVCodec *codec_list[] = {
&ff_bintext_decoder,
&ff_xbin_decoder,
&ff_idf_decoder,
&ff_h264_cuvid_decoder,
&ff_hevc_cuvid_decoder,
&ff_mjpeg_cuvid_decoder,
&ff_mpeg1_cuvid_decoder,
&ff_mpeg2_cuvid_decoder,
&ff_mpeg4_cuvid_decoder,
&ff_vc1_cuvid_decoder,
&ff_vp8_cuvid_decoder,
&ff_vp8_qsv_decoder,
&ff_vp9_cuvid_decoder,
NULL };
\ No newline at end of file
......@@ -40,6 +40,7 @@
#include "libavcodec/x86/simple_idct.h"
#endif
#include "libavcodec/sbrdsp.h"
#include "libavcodec/sbcdsp.h"
#include "libavcodec/rv34dsp.h"
#include "libavcodec/rdft.h"
#include "libavcodec/qpeldsp.h"
......@@ -3506,6 +3507,7 @@ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc) {return;}
void ff_rv34dsp_init_arm(RV34DSPContext *c) {return;}
void ff_rv40dsp_init_aarch64(RV34DSPContext *c) {return;}
void ff_rv40dsp_init_arm(RV34DSPContext *c) {return;}
void ff_sbcdsp_init_arm(SBCDSPContext *s) {return;}
void ff_sbrdsp_init_aarch64(SBRDSPContext *s) {return;}
void ff_sbrdsp_init_arm(SBRDSPContext *s) {return;}
void ff_sbrdsp_init_mips(SBRDSPContext *s) {return;}
......
......@@ -51,6 +51,7 @@ static const AVCodecParser *parser_list[] = {
&ff_pnm_parser,
&ff_rv30_parser,
&ff_rv40_parser,
&ff_sbc_parser,
&ff_sipr_parser,
&ff_tak_parser,
&ff_vc1_parser,
......
......@@ -268,6 +268,7 @@
<ClCompile Include="..\libavfilter\vf_hue.c" />
<ClCompile Include="..\libavfilter\vf_hwdownload.c" />
<ClCompile Include="..\libavfilter\vf_hwmap.c" />
<ClCompile Include="..\libavfilter\vf_hwupload_cuda.c" />
<ClCompile Include="..\libavfilter\vf_hwupload.c" />
<ClCompile Include="..\libavfilter\vf_hysteresis.c" />
<ClCompile Include="..\libavfilter\vf_il.c" />
......
......@@ -627,6 +627,9 @@
<ClCompile Include="..\libavfilter\vf_hwmap.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_hwupload_cuda.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_hwupload.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......
......@@ -185,7 +185,6 @@ const AVFilter ff_vf_coreimage = {0};
const AVFilter ff_vf_deinterlace_vaapi = {0};
const AVFilter ff_vf_denoise_vaapi = {0};
const AVFilter ff_vf_frei0r = {0};
const AVFilter ff_vf_hwupload_cuda = {0};
const AVFilter ff_vf_libvmaf = {0};
const AVFilter ff_vf_ocr = {0};
const AVFilter ff_vf_ocv = {0};
......
......@@ -413,6 +413,7 @@
<ClCompile Include="..\libavformat\samidec.c" />
<ClCompile Include="..\libavformat\sapdec.c" />
<ClCompile Include="..\libavformat\sapenc.c" />
<ClCompile Include="..\libavformat\sbcdec.c" />
<ClCompile Include="..\libavformat\sbgdec.c" />
<ClCompile Include="..\libavformat\sccdec.c" />
<ClCompile Include="..\libavformat\sccenc.c" />
......
......@@ -1066,6 +1066,9 @@
<ClCompile Include="..\libavformat\sapenc.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\sbcdec.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\sbgdec.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......
......@@ -217,6 +217,7 @@ static const AVInputFormat *demuxer_list[] = {
&ff_s337m_demuxer,
&ff_sami_demuxer,
&ff_sap_demuxer,
&ff_sbc_demuxer,
&ff_sbg_demuxer,
&ff_scc_demuxer,
&ff_sdp_demuxer,
......
......@@ -145,6 +145,7 @@ static const AVOutputFormat *muxer_list[] = {
&ff_rtp_mpegts_muxer,
&ff_rtsp_muxer,
&ff_sap_muxer,
&ff_sbc_muxer,
&ff_scc_muxer,
&ff_segment_muxer,
&ff_stream_segment_muxer,
......
......@@ -139,6 +139,7 @@
<ClCompile Include="..\libavutil\xga_font_data.c" />
<ClCompile Include="..\libavutil\xtea.c" />
<ClCompile Include="..\libavutil\tea.c" />
<ClCompile Include="..\libavutil\hwcontext_cuda.c" />
<ClCompile Include="..\libavutil\hwcontext_dxva2.c" />
<ClCompile Include="..\libavutil\hwcontext_qsv.c" />
<ClCompile Include="..\libavutil\lzo.c" />
......
......@@ -246,6 +246,9 @@
<ClCompile Include="..\libavutil\tea.c">
<Filter>Source Files\libavutil</Filter>
</ClCompile>
<ClCompile Include="..\libavutil\hwcontext_cuda.c">
<Filter>Source Files\libavutil</Filter>
</ClCompile>
<ClCompile Include="..\libavutil\hwcontext_dxva2.c">
<Filter>Source Files\libavutil</Filter>
</ClCompile>
......
......@@ -56,7 +56,13 @@ Many of the possible FFmpeg dependencies (and there dependencies) are available
However the following is a list of extra dependency options that require external downloads:
1) opengl (requires glext)
a) Download glext.h and wglext.h from opengl.org.
b) Save the header files into OutputDir/include/gl/*.
b) Save the header files into "OutputDir/include/gl/*".
2) ffnvcodec (requires nv-codec-headers)
a) Download the nv-codec-headers repository from https://github.com/FFmpeg/nv-codec-headers
b) Save the contents of the nv-codec-headers repositories "include" folder into "OutputDir/include/*".
3) AMF (requires Advanced Media Framework (AMF) SDK headers)
a) Download the AMF repository from https://github.com/GPUOpen-LibrariesAndSDKs/AMF
b) Save the contents of the AMF repositories "amf/public/include" into "OutputDir/include/AMF/*".
*OutputDir is the "Output Directory" specified in the project properties.
The default value of OutputDir is "..\..\msvc" relative to the FFmpeg source directory. An example of the expected
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册