CMake: add arguments AVTRANSCODER_ LIBAV/FFMPEG _DEPENDENCY

Clement Champetier · Clement Champetier · commit 73d290012358 · 2015-03-13T16:59:23.000+01:00
* Which replace AV/FF_RESAMPLE_LIBRARY.
diff --git a/src/AvTranscoder/Library.cpp b/src/AvTranscoder/Library.cpp
@@ -5,7 +5,7 @@ extern "C" {
 #include <libavcodec/version.h>
 #include <libswscale/version.h>
 #include <libswscale/swscale.h>
-#ifdef AV_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_LIBAV_DEPENDENCY
 	#include <libavresample/version.h>
 #else
 	#include <libswresample/version.h>
@@ -80,7 +80,7 @@ Libraries getLibraries()
 	libs.push_back( Library( "avutil",       avutil_license(),     LIBAVUTIL_VERSION_MAJOR,     LIBAVUTIL_VERSION_MINOR,     LIBAVUTIL_VERSION_MICRO     ) );
 	libs.push_back( Library( "avformat",     avformat_license(),   LIBAVFORMAT_VERSION_MAJOR,   LIBAVFORMAT_VERSION_MINOR,   LIBAVFORMAT_VERSION_MICRO   ) );
 	libs.push_back( Library( "avcodec",      avcodec_license(),    LIBAVCODEC_VERSION_MAJOR,    LIBAVCODEC_VERSION_MINOR,    LIBAVCODEC_VERSION_MICRO    ) );
-#ifdef AV_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_LIBAV_DEPENDENCY
 	libs.push_back( Library( "avresample",   avutil_license(),     LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) );
 #else
 	libs.push_back( Library( "swresample",   avutil_license(),     LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) );
diff --git a/src/AvTranscoder/transform/AudioTransform.cpp b/src/AvTranscoder/transform/AudioTransform.cpp
@@ -6,7 +6,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>
 
-#ifdef AV_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_LIBAV_DEPENDENCY
  #include <libavresample/avresample.h>
  #define AllocResampleContext avresample_alloc_context
  #define FreeResampleContext avresample_free
@@ -98,7 +98,7 @@ void AudioTransform::convert( const Frame& srcFrame, Frame& dstFrame )
 	unsigned char* dstData = dstFrame.getData();
 
 	int nbOutputSamplesPerChannel;
-#ifdef AV_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_LIBAV_DEPENDENCY
 	nbOutputSamplesPerChannel = avresample_convert( _audioConvertContext, (uint8_t**)&dstData, 0, dstFrame.getSize(), (uint8_t**)&srcData, 0, srcFrame.getSize() );
 #else
 	nbOutputSamplesPerChannel = swr_convert( _audioConvertContext, &dstData, dstFrame.getSize(), &srcData, srcFrame.getSize() );
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -6,7 +6,7 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/frame/Frame.hpp>
 
-#ifdef AV_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_LIBAV_DEPENDENCY
  #define ResampleContext AVAudioResampleContext
 #else
  #define ResampleContext SwrContext
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,15 +2,16 @@
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(AvTranscoderMacros)
 
-##find_package(FFmpeg)
-find_package(FFmpeg
-	COMPONENTS avcodec avformat avutil swscale swresample avresample)
+# find package ffmpeg/libav
+find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale swresample avresample)
 
 # Check if FFmpeg or libav dependency
-if(avresample_VERSION)
-	add_definitions(-DAV_RESAMPLE_LIBRARY)
-elseif(swresample_VERSION)
-	add_definitions(-DFF_RESAMPLE_LIBRARY)
+if(avresample_FOUND)
+	add_definitions(-DAVTRANSCODER_LIBAV_DEPENDENCY)
+	message("Build avTranscoder with dependency to libav.")
+elseif(swresample_FOUND)
+	add_definitions(-DAVTRANSCODER_FFMPEG_DEPENDENCY)
+        message("Build avTranscoder with dependency to ffmpeg.")
 else()
         message(SEND_ERROR, "Need 'swresample' or 'avresample'.")
 endif()
