avTranscoder · MarcAntoine-Arnaud · Sep 26, 2014 · Sep 26, 2014 · Sep 26, 2014 · Oct 22, 2014
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 2.8) 
 
-project(AvTranscoder)
+project(avtranscoder)
 
-# Set AvTranscoder versions
+# 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
+# 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})
@@ -26,5 +26,35 @@ else()
 endif()
 
 
+# CPack options
+SET(CPACK_DEB_COMPONENT_INSTALL 1)
+set(CPACK_INSTALL_PREFIX "/usr")
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+
+
+set(CPACK_GENERATOR
+	"DEB")
+
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER
+	"Marc-Antoine ARNAUD")
+
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+	"C++ API for LibAV / FFMpeg - provides the high level API to re-wrap or transcode media easily.")
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS
+	"${CPACK_DEBIAN_PACKAGE_AUTO_DEPENDS}, libavutil, libavcodec, libavformat, libavdevice, libswscale, libavresample")
+
+set(CPACK_COMPONENT_DEV_DESCRIPTION
+   "C/C++ header files for use with avtranscoder")
+
+# interconnected dependencies
+# set(CPACK_COMPONENT_TOOLS_DEPENDS lib)
+# set(CPACK_COMPONENT_DEV_DEPENDS lib)
+# set(CPACK_COMPONENT_PYTHON_DEPENDS lib)
+# set(CPACK_COMPONENT_JAVA_DEPENDS lib)
+
 add_subdirectory(src)
 add_subdirectory(app)
+
+include(CPack)
+
diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt
@@ -20,11 +20,13 @@ endif()
 install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
+	DESTINATION "bin"
+	COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avinfo.man
 	RENAME "avinfo.1"
-	DESTINATION "share/man/man1/"
+	DESTINATION "share/man/man1"
+	COMPONENT tools
 )
diff --git a/app/avInfo/avInfo.cpp b/app/avInfo/avInfo.cpp
@@ -2,7 +2,7 @@
 #include <iomanip>
 #include <sstream>
 
-#include <AvTranscoder/Library.hpp>
+#include <avtranscoder/Library.hpp>
 
 int main( int argc, char** argv )
 {

diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt
@@ -21,10 +21,12 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avmeta.man
 	RENAME "avmeta.1"
 	DESTINATION "share/man/man1/"
+	COMPONENT tools
 )
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -1,7 +1,7 @@
-#include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
+#include <avtranscoder/file/InputFile.hpp>
+#include <avtranscoder/mediaProperty/printMediaProperty.hpp>
 
-#include <AvTranscoder/progress/NoDisplayProgress.hpp>
+#include <avtranscoder/progress/NoDisplayProgress.hpp>
 
 #include <iostream>
 

diff --git a/app/avTranscoder/CMakeLists.txt b/app/avTranscoder/CMakeLists.txt
@@ -21,10 +21,12 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man
 	RENAME av++.1
 	DESTINATION "share/man/man1/"
+	COMPONENT tools
 )
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -2,19 +2,19 @@
 #include <iomanip>
 #include <cstdlib>
 
-#include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/file/OutputFile.hpp>
+#include <avtranscoder/file/InputFile.hpp>
+#include <avtranscoder/file/OutputFile.hpp>
 
-#include <AvTranscoder/frame/Frame.hpp>
+#include <avtranscoder/frame/Frame.hpp>
 
-#include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
+#include <avtranscoder/essenceStream/AvInputAudio.hpp>
+#include <avtranscoder/essenceStream/AvInputVideo.hpp>
+#include <avtranscoder/essenceStream/AvOutputAudio.hpp>
+#include <avtranscoder/essenceStream/AvOutputVideo.hpp>
 
-#include <AvTranscoder/transform/VideoTransform.hpp>
+#include <avtranscoder/transform/VideoTransform.hpp>
 
-#include <AvTranscoder/progress/ConsoleProgress.hpp>
+#include <avtranscoder/progress/ConsoleProgress.hpp>
 
 void transcodeVideo( const char* inputfilename, const char* outputFilename )
 {

diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -1,13 +1,13 @@
 #ifndef _AVPLAYER_AVREADER_
 #define _AVPLAYER_AVREADER_
 
-#include <AvTranscoder/file/InputFile.hpp>
-#include <AvTranscoder/essenceStream/AvInputAudio.hpp>
-#include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/transform/VideoTransform.hpp>
-#include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
+#include <avtranscoder/file/InputFile.hpp>
+#include <avtranscoder/essenceStream/AvInputAudio.hpp>
+#include <avtranscoder/essenceStream/AvInputVideo.hpp>
+#include <avtranscoder/transform/VideoTransform.hpp>
+#include <avtranscoder/mediaProperty/printMediaProperty.hpp>
 
-#include <AvTranscoder/progress/ConsoleProgress.hpp>
+#include <avtranscoder/progress/ConsoleProgress.hpp>
 
 #include "Reader.hpp"
 

diff --git a/app/avplay/CMakeLists.txt b/app/avplay/CMakeLists.txt
@@ -43,10 +43,12 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
 	RENAME avplayer.1
 	DESTINATION "share/man/man1/"
+	COMPONENT tools
 )
diff --git a/app/genericProcessor/CMakeLists.txt b/app/genericProcessor/CMakeLists.txt
@@ -21,10 +21,12 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+	COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man
 	RENAME avprocessor.1
 	DESTINATION "share/man/man1/"
+	COMPONENT tools
 )
diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -1,6 +1,6 @@
-#include <AvTranscoder/transcoder/Transcoder.hpp>
+#include <avtranscoder/transcoder/Transcoder.hpp>
 
-#include <AvTranscoder/progress/ConsoleProgress.hpp>
+#include <avtranscoder/progress/ConsoleProgress.hpp>
 
 #include <iostream>
 #include <iomanip>

diff --git a/app/jTranscoder/jTranscoder.java b/app/jTranscoder/jTranscoder.java
@@ -1,5 +1,5 @@
 
-import org.AvTranscoder.InputFile;
+import org.avtranscoder.InputFile;
 
 
 public class jTranscoder {

diff --git a/app/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt
@@ -29,4 +29,5 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+        COMPONENT tools
 )
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -1,8 +1,8 @@
-#include <AvTranscoder/util.hpp>
-#include <AvTranscoder/option/Context.hpp>
-#include <AvTranscoder/option/CodecContext.hpp>
-#include <AvTranscoder/option/Option.hpp>
-#include <AvTranscoder/file/InputFile.hpp>
+#include <avtranscoder/util.hpp>
+#include <avtranscoder/option/Context.hpp>
+#include <avtranscoder/option/CodecContext.hpp>
+#include <avtranscoder/option/Option.hpp>
+#include <avtranscoder/file/InputFile.hpp>
 
 #include <string>
 #include <iostream>

diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt
@@ -29,10 +29,12 @@ install(
 	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
+        COMPONENT tools
 )
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
 	RENAME avprofiles.1
 	DESTINATION "share/man/man1/"
+        COMPONENT tools
 )
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -1,10 +1,10 @@
 
 #include <iostream>
 #include <iomanip>
-#include <AvTranscoder/Profile.hpp>
+#include <avtranscoder/Profile.hpp>
 
-#include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
-#include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
+#include <avtranscoder/essenceStream/AvOutputVideo.hpp>
+#include <avtranscoder/essenceStream/AvOutputAudio.hpp>
 
 
 int main( int argc, char** argv )

diff --git a/app/pyProcessor/pyProcessor.py b/app/pyProcessor/pyProcessor.py
@@ -1,6 +1,6 @@
 import sys
 
-from AvTranscoder import AvTranscoder
+from avtranscoder import avtranscoder
 
 def parseConfigFile( inputConfigFile, transcoder ):
 	"""
@@ -29,17 +29,17 @@ def parseConfigFile( inputConfigFile, transcoder ):
 	exit(1)
 
 # create Transcoder
-ouputFile = AvTranscoder.OutputFile( sys.argv[2] )
-transcoder = AvTranscoder.Transcoder( ouputFile )
+ouputFile = avtranscoder.OutputFile( sys.argv[2] )
+transcoder = avtranscoder.Transcoder( ouputFile )
 
 # parse configuration file
 inputConfigFile = sys.argv[1]
 parseConfigFile( inputConfigFile, transcoder )
 
 # initialize Transcoder
-transcoder.setProcessMethod( AvTranscoder.eProcessMethodLongest )
+transcoder.setProcessMethod( avtranscoder.eProcessMethodLongest )
 transcoder.init()
 
 # Process transcode
-progress = AvTranscoder.ProgressListener()
+progress = avtranscoder.ProgressListener()
 transcoder.process( progress )
diff --git a/cmake/AvTranscoderMacros.cmake b/cmake/AvTranscoderMacros.cmake
@@ -1,4 +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")
+file(GLOB_RECURSE AVTRANSCODER_SRC_FILES "avtranscoder/*.cpp" "avtranscoder/*.hpp")
diff --git a/src/AvTranscoder/progress/progress.i b/src/AvTranscoder/progress/progress.i