mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

Add ImageMagic/Libavcodec find logic

Browse Source
This commit is contained in:
BtbN 2014-06-28 20:37:33 +02:00
parent 8b0315ada6
commit ed9d5b1d63
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libobs/CMakeLists.txt
View File

@ -16,9 +16,35 @@ find_package(Libavformat REQUIRED)
include_directories(${LIBAVFORMAT_INCLUDE_DIRS})
add_definitions(${LIBAVFORMAT_DEFINITIONS})
find_package(Libavcodec REQUIRED)
include_directories(${LIBAVCODEC_INCLUDE_DIRS})
add_definitions(${LIBAVCODEC_DEFINITIONS})
find_package(Libavcodec QUIET)
find_package(ImageMagick QUIET COMPONENTS MagickCore)
if(NOT ImageMagick_MagickCore_FOUND AND NOT LIBAVCODEC_FOUND)
message(FATAL_ERROR "Either MagickCore or Libavcodec is required, but both were not found")
endif()
option(LIBOBS_PREFER_IMAGEMAGICK "Prefer ImageMagick over ffmpeg for image loading" ON)
if(NOT LIBAVCODEC_FOUND OR (ImageMagick_MagickCore_FOUND AND LIBOBS_PREFER_IMAGEMAGICK))
message(STATUS "Using ImageMagick for image loading in libobs")
set(libobs_image_loading_SOURCES
graphics/graphics-magick.c)
set(libobs_image_loading_LIBRARIES
${ImageMagick_LIBRARIES})
include_directories(
${ImageMagick_INCLUDE_DIRS})
else()
message(STATUS "Using libavcodec for image loading in libobs")
set(libobs_image_loading_SOURCES
graphics/graphics-ffmpeg.c)
set(libobs_image_loading_LIBRARIES
${LIBAVCODEC_LIBRARIES})
include_directories(${LIBAVCODEC_INCLUDE_DIRS})
endif()
add_definitions(-DLIBOBS_EXPORTS)
@ -81,6 +107,7 @@ set(libobs_callback_HEADERS
callback/signal.h)
set(libobs_graphics_SOURCES
${libobs_image_loading_SOURCES}
graphics/quat.c
graphics/effect-parser.c
graphics/axisang.c
@ -92,7 +119,6 @@ set(libobs_graphics_SOURCES
graphics/matrix4.c
graphics/vec3.c
graphics/graphics.c
graphics/graphics-ffmpeg.c
graphics/shader-parser.c
graphics/plane.c
graphics/effect.c
@ -240,11 +266,11 @@ target_link_libraries(libobs
PRIVATE
jansson
${libobs_PLATFORM_DEPS}
${libobs_image_loading_LIBRARIES}
${LIBSWSCALE_LIBRARIES}
${LIBSWRESAMPLE_LIBRARIES}
${LIBAVFORMAT_LIBRARIES}
${LIBAVUTIL_LIBRARIES}
${LIBAVCODEC_LIBRARIES})
${LIBAVUTIL_LIBRARIES})
install_obs_core(libobs EXPORT LibObs)
install_obs_data(libobs ../build/data/libobs libobs)

2
libobs/graphics/graphics-magick.c
View File

@ -30,7 +30,7 @@ texture_t gs_create_texture_from_file(const char *file)
data, exception);
if (exception->severity == UndefinedException)
tex = gs_create_texture(cx, cy, GS_BGRA, 1,
(const uint8**)&data, 0);
(const uint8_t**)&data, 0);
else
blog(LOG_WARNING, "magickcore warning/error getting "
"pixels from file '%s': %s", file,