avTranscoder · MarcAntoine-Arnaud · Sep 10, 2014 · Sep 2, 2014 · Sep 2, 2014 · Sep 3, 2014
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,10 @@ config.log
 scons.cfg
 build
 dist
+
+# CMake
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+install_manifest.txt
diff --git a/.travis.yml b/.travis.yml
@@ -17,10 +17,10 @@ before_script:
   - sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
   - sudo apt-get update -qq
   - sudo apt-get install -qq gcc g++ scons swig swig2.0
-  - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen python-git
+  - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev libxmu-dev doxygen
 
 script:
-  - scons
+  - mkdir build && cd build && cmake ../ && make
 
 after_failure:
   - cat config.log

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8) 
+
+project(AvTranscoder)
+
+# Set AvTranscoder versions
+set(AVTRANSCODER_VERSION_MAJOR "0")
+set(AVTRANSCODER_VERSION_MINOR "2")
+set(AVTRANSCODER_VERSION_MICRO "1")
+set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
+
+# Define AvTranscoder versions
+add_definitions(-DAVTRANSCODER_VERSION_MAJOR=${AVTRANSCODER_VERSION_MAJOR})
+add_definitions(-DAVTRANSCODER_VERSION_MINOR=${AVTRANSCODER_VERSION_MINOR})
+add_definitions(-DAVTRANSCODER_VERSION_MICRO=${AVTRANSCODER_VERSION_MICRO})
+
+# Diplay commands being ran by CMake
+set(CMAKE_VERBOSE_MAKEFILE OFF)
+
+# CPP flags on debug / release mode
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -pg -g")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
+
+add_subdirectory(src)
+add_subdirectory(app)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(cpp/avInfo)
+add_subdirectory(cpp/avMeta)
+add_subdirectory(cpp/avplay)
+add_subdirectory(cpp/avTranscoder)
+add_subdirectory(cpp/genericProcessor)
+add_subdirectory(cpp/optionChecker)
+add_subdirectory(cpp/presetChecker)
diff --git a/app/cpp/avInfo/CMakeLists.txt b/app/cpp/avInfo/CMakeLists.txt
@@ -0,0 +1,23 @@
+### cpp/avInfo
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH})
+add_executable(avinfo avInfo.cpp)
+set_target_properties(avinfo PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avinfo avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avinfo.man
+	RENAME "avinfo.1"
+	DESTINATION "share/man/man1/"
+)
diff --git a/app/cpp/avMeta/CMakeLists.txt b/app/cpp/avMeta/CMakeLists.txt
@@ -0,0 +1,23 @@
+### cpp/avMeta
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+add_executable(avmeta avMeta.cpp)
+set_target_properties(avmeta PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avmeta avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avmeta.man
+	RENAME "avmeta.1"
+	DESTINATION "share/man/man1/"
+)
diff --git a/app/cpp/avTranscoder/CMakeLists.txt b/app/cpp/avTranscoder/CMakeLists.txt
@@ -0,0 +1,23 @@
+### cpp/avTranscoder
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+add_executable(avtranscoder avTranscoder.cpp)
+set_target_properties(avtranscoder PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avtranscoder avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man
+	RENAME av++.1
+	DESTINATION "share/man/man1/"
+)
diff --git a/app/cpp/avplay/CMakeLists.txt b/app/cpp/avplay/CMakeLists.txt
@@ -0,0 +1,29 @@
+### cpp/avplay
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+find_package(OpenGL REQUIRED)
+find_package(GLUT REQUIRED)
+
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+include_directories( ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIRS} )
+
+file(GLOB AVPLAY_SRC_FILES "*.cpp" "*.hpp")
+add_executable(avplay ${AVPLAY_SRC_FILES})
+set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
+	RENAME avplayer.1
+	DESTINATION "share/man/man1/"
+)
diff --git a/app/cpp/genericProcessor/CMakeLists.txt b/app/cpp/genericProcessor/CMakeLists.txt
@@ -0,0 +1,23 @@
+### cpp/avProcessor
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+add_executable(avprocessor genericProcessor.cpp)
+set_target_properties(avprocessor PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avprocessor avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man
+	RENAME avprocessor.1
+	DESTINATION "share/man/man1/"
+)
diff --git a/app/cpp/optionChecker/CMakeLists.txt b/app/cpp/optionChecker/CMakeLists.txt
@@ -0,0 +1,20 @@
+### cpp/avOptionChecker
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+# Add C++11 flag
+set(CMAKE_CXX_FLAGS "-std=c++0x")
+add_executable(avoptionchecker optionChecker.cpp)
+set_target_properties(avoptionchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avoptionchecker avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
diff --git a/app/cpp/presetChecker/CMakeLists.txt b/app/cpp/presetChecker/CMakeLists.txt
@@ -0,0 +1,25 @@
+### cpp/avPresetChecker
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
+# Add C++11 flag
+set(CMAKE_CXX_FLAGS "-std=c++0x")
+add_executable(avpresetchecker presetChecker.cpp)
+set_target_properties(avpresetchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avpresetchecker avtranscoder-shared)
+
+# Install app
+install(
+	FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}"
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
+	RENAME avprofiles.1
+	DESTINATION "share/man/man1/"
+)
diff --git a/cmake/AvTranscoderMacros.cmake b/cmake/AvTranscoderMacros.cmake
@@ -0,0 +1,4 @@
+# Get useful variables
+set(AVTRANSCODER_APP_PATH "${PROJECT_SOURCE_DIR}/app")
+set(AVTRANSCODER_SRC_PATH "${PROJECT_SOURCE_DIR}/src")
+file(GLOB_RECURSE AVTRANSCODER_SRC_FILES "AvTranscoder/*.cpp" "AvTranscoder/*.hpp")
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -0,0 +1,119 @@
+# - Find FFmpeg library
+# Find the native FFmpeg includes and library.
+# 
+# This module defines:
+# FFMPEG_FOUND
+# FFMPEG_INCLUDE_DIR - The FFmpeg include directory.
+# FFMPEG_LIBRARIES - The FFmpeg libraries.
+# FFMPEG_DEFINITIONS - The FFmpeg compile flags.
+# 
+# For each component:
+# ${COMPONENT}_FOUND
+# ${COMPONENT}_INCLUDE_DIR
+# ${COMPONENT}_LIBRARIES
+# ${COMPONENT}_DEFINITIONS
+# ${COMPONENT}_VERSION
+#
+# If any component is specified, default components are avcodec avformat avutil.
+#
+
+### Macro: check_ffmpeg_version
+#	
+# Check FFmpeg version.
+# @todo: clean how to get current FFmpeg version.
+#
+macro(check_ffmpeg_version)
+	exec_program("ffmpeg -version 2>&1 | grep 'ffmpeg version' | sed -e 's/ffmpeg\ version\ //'"
+		OUTPUT_VARIABLE FFmpeg_CURRENT_VERSION)
+	if(${FFmpeg_CURRENT_VERSION} LESS ${FFmpeg_FIND_VERSION})
+		message(SEND_ERROR "Your FFmpeg version is too old (${FFmpeg_CURRENT_VERSION} < ${FFmpeg_FIND_VERSION}).")
+	endif()
+endmacro()
+
+
+### Macro: find_component
+#	
+# Check the given component by invoking pkgconfig and 
+# then looking up the libraries and include directories.
+# @todo: WIN and MAC OSX.
+#
+macro(find_component COMPONENT PKGCONFIG LIBRARY HEADER)
+	if(NOT WIN32)
+		# use pkg-config to get the directories and then use these values
+		# in the FIND_PATH() and FIND_LIBRARY() calls
+		find_package(PkgConfig)
+		if(PKG_CONFIG_FOUND)
+			pkg_check_modules(PC_${COMPONENT} ${PKGCONFIG})
+		endif()
+	endif()
+
+	find_path(${COMPONENT}_INCLUDE_DIR
+		${HEADER}
+		PATH ${PC_LIB${COMPONENT}_INCLUDEDIR} ${PC_LIB${COMPONENT}_INCLUDE_DIR}
+		PATH_SUFFIXES ffmpeg libav
+	)
+
+	find_library(${COMPONENT}_LIBRARIES 
+		NAMES ${LIBRARY}
+		PATH ${PC_LIB${COMPONENT}_LIBDIR} ${PC_LIB${COMPONENT}_LIBRARY_DIRS}
+	)
+
+	set(${COMPONENT}_DEFINITIONS ${PC_${COMPONENT}_CFLAGS_OTHER} CACHE STRING "The ${COMPONENT} CFLAGS.")	
+	set(${COMPONENT}_VERSION ${PC_${COMPONENT}_VERSION} CACHE STRING "The ${COMPONENT} version number.")
+
+	# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIR is present.	
+	if(${COMPONENT}_LIBRARIES AND ${COMPONENT}_INCLUDE_DIR)
+		set(${COMPONENT}_FOUND TRUE)
+	else()
+		set(${COMPONENT}_FOUND FALSE)
+	endif()
+
+	mark_as_advanced(
+		${COMPONENT}_INCLUDE_DIR
+		${COMPONENT}_LIBRARIES
+		${COMPONENT}_DEFINITIONS
+		${COMPONENT}_VERSION
+	)
+endmacro()
+
+# Get FFmpeg from custom install
+if(FFMPEG_LIBRARY_DIR AND FFMPEG_INCLUDE_DIR)
+	set(FFMPEG_FOUND TRUE)
+	file(GLOB FFMPEG_LIBRARIES "${FFMPEG_LIBRARY_DIR}/*.so")
+# Get FFmpeg from system install
+else()
+	# Check FFmpeg version
+	if(DEFINED FFmpeg_FIND_VERSION)
+		check_ffmpeg_version()
+	endif()
+
+	if(NOT FFmpeg_FIND_COMPONENTS)
+		set(FFmpeg_FIND_COMPONENTS avcodec avformat avutil)
+	endif()
+
+	# Check components and add their stuff to the FFMPEG_* vars.
+	foreach(COMPONENT ${FFmpeg_FIND_COMPONENTS})
+		# Get component name is lower cases.
+		string(TOLOWER ${COMPONENT} LOWERCOMPONENT)
+		find_component(${COMPONENT} lib${LOWERCOMPONENT} ${LOWERCOMPONENT} lib${LOWERCOMPONENT}/${LOWERCOMPONENT}.h)
+		# If the component is found.
+		if(${COMPONENT}_FOUND)
+			message(STATUS "Component ${COMPONENT} present.")
+			set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${COMPONENT}_LIBRARIES})
+			set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${COMPONENT}_DEFINITIONS})
+			list(APPEND FFMPEG_INCLUDE_DIR ${${COMPONENT}_INCLUDE_DIR})
+		else()
+			if(FFmpeg_FIND_REQUIRED)
+				message(SEND_ERROR "Error: required component ${COMPONENT} missing.")
+			else()
+				message(STATUS "Warning: component ${COMPONENT} missing.")
+			endif()
+		endif()
+	endforeach()
+
+	# Build the include path with duplicates removed.
+	if(FFMPEG_INCLUDE_DIR)
+		list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIR)
+		set(FFMPEG_FOUND TRUE)
+	endif()
+endif()