Commit cc422c23 authored by François Grisez's avatar François Grisez

Enable VideoToolbox support on MacOSX

parent d0184a0b
......@@ -97,7 +97,7 @@ cmake_dependent_option(ENABLE_THEORA "Enable theora video codec support." YES "E
cmake_dependent_option(ENABLE_VPX "Build mediastreamer2 with VPX codec." YES "ENABLE_VIDEO" NO)
option(ENABLE_MKV "Enable support of MKV files reading and writing." YES)
cmake_dependent_option(ENABLE_QNX "Build medistreamer2 with BB10 filters." NO "ENABLE_VIDEO" NO)
cmake_dependent_option(ENABLE_VT_H264 "Build mediastreamer2 with H264 encoder/decoder based on VirtualToolbox (iOS only)" YES "ENABLE_VIDEO" NO)
cmake_dependent_option(ENABLE_VT_H264 "Build mediastreamer2 with H264 encoder/decoder based on VirtualToolbox (Apple only)" YES "ENABLE_VIDEO" NO)
macro(apply_compile_flags SOURCE_FILES)
......@@ -461,7 +461,7 @@ if(APPLE)
list(APPEND LINK_FLAGS "-framework Foundation" "-framework QuartzCore" "-framework OpenGLES" "-framework UIKit" "-framework AVFoundation")
if(ENABLE_VIDEO)
list(APPEND LINK_FLAGS "-framework CoreGraphics" "-framework CoreMedia" "-framework CoreVideo")
if(IOS AND ENABLE_VT_H264) # Necessary for Mediastreamer's tools and testers
if(ENABLE_VT_H264) # Necessary on iOS for Mediastreamer's tools and testers
list(APPEND LINK_FLAGS "-framework VideoToolbox")
endif()
endif()
......@@ -472,6 +472,9 @@ if(APPLE)
endif()
if(ENABLE_VIDEO)
list(APPEND LINK_FLAGS "-framework Cocoa" "-framework OpenGL" "-framework QuartzCore" "-framework QTKit")
if(ENABLE_VT_H264)
list(APPEND LINK_FLAGS "-framework VideoToolbox -framework CoreMedia")
endif()
endif()
set(PLUGINS_EXT ".dylib")
add_definitions("-DTARGET_OS_MAC=1")
......
......@@ -280,7 +280,7 @@ if(ENABLE_VIDEO)
)
endif()
endif()
if(ENABLE_VT_H264 AND IOS)
if(ENABLE_VT_H264 AND APPLE)
list(APPEND VOIP_SOURCE_FILES_C videofilters/videotoolbox.c)
endif()
if (ENABLE_QNX)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment