提交 260ea7a7 编写于 作者: C Clément Bœsch 提交者: Clément Bœsch

build: cleanup videotoolbox

- there is no need for kCVImageBufferColorPrimaries_ITU_R_2020 checks,
  it's done at runtime
- VideoToolbox presence is now checked with check_apple_framework()
- link to CoreServices is only done when videotoolbox is enabled
上级 1cf23e3f
...@@ -1608,7 +1608,6 @@ EXTERNAL_LIBRARY_LIST=" ...@@ -1608,7 +1608,6 @@ EXTERNAL_LIBRARY_LIST="
openal openal
opencl opencl
opengl opengl
videotoolbox
" "
HWACCEL_AUTODETECT_LIBRARY_LIST=" HWACCEL_AUTODETECT_LIBRARY_LIST="
...@@ -1622,7 +1621,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" ...@@ -1622,7 +1621,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST="
vaapi vaapi
vda vda
vdpau vdpau
videotoolbox_hwaccel videotoolbox
xvmc xvmc
" "
...@@ -2180,7 +2179,6 @@ CONFIG_EXTRA=" ...@@ -2180,7 +2179,6 @@ CONFIG_EXTRA="
vp3dsp vp3dsp
vp56dsp vp56dsp
vp8dsp vp8dsp
vt_bt2020
wma_freqs wma_freqs
wmv2dsp wmv2dsp
" "
...@@ -2938,11 +2936,9 @@ libx265_encoder_deps="libx265" ...@@ -2938,11 +2936,9 @@ libx265_encoder_deps="libx265"
libxavs_encoder_deps="libxavs" libxavs_encoder_deps="libxavs"
libxvid_encoder_deps="libxvid" libxvid_encoder_deps="libxvid"
libzvbi_teletext_decoder_deps="libzvbi" libzvbi_teletext_decoder_deps="libzvbi"
videotoolbox_deps="VideoToolbox_VideoToolbox_h"
videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo" videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo"
videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames" videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
videotoolbox_encoder_suggest="vda_framework vt_bt2020" videotoolbox_encoder_suggest="vda_framework"
vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020"
# demuxers / muxers # demuxers / muxers
ac3_demuxer_select="ac3_parser" ac3_demuxer_select="ac3_parser"
...@@ -5740,9 +5736,7 @@ check_header termios.h ...@@ -5740,9 +5736,7 @@ check_header termios.h
check_header unistd.h check_header unistd.h
check_header valgrind/valgrind.h check_header valgrind/valgrind.h
check_header VideoDecodeAcceleration/VDADecoder.h check_header VideoDecodeAcceleration/VDADecoder.h
check_header VideoToolbox/VideoToolbox.h
check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox
enabled videotoolbox && check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferColorPrimaries_ITU_R_2020 -framework CoreVideo
check_header windows.h check_header windows.h
check_header X11/extensions/XvMClib.h check_header X11/extensions/XvMClib.h
check_header asm/types.h check_header asm/types.h
...@@ -5757,16 +5751,17 @@ check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32 ...@@ -5757,16 +5751,17 @@ check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32
check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32
check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
check_lib coreservices "CoreServices/CoreServices.h" UTGetOSTypeFromString "-framework CoreServices"
enabled audiotoolbox && check_apple_framework AudioToolbox enabled audiotoolbox && check_apple_framework AudioToolbox
enabled avfoundation && check_apple_framework AVFoundation enabled avfoundation && check_apple_framework AVFoundation
enabled coreimage && check_apple_framework CoreImage enabled coreimage && check_apple_framework CoreImage
enabled videotoolbox && check_apple_framework VideoToolbox
enabled avfoundation && { enabled avfoundation && {
check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" || check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" ||
check_lib avfoundation ApplicationServices/ApplicationServices.h CGGetActiveDisplayList "-framework ApplicationServices"; } check_lib avfoundation ApplicationServices/ApplicationServices.h CGGetActiveDisplayList "-framework ApplicationServices"; }
enabled videotoolbox &&
check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices"
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册