From f0e1b0076329e3688ce95337a4b76bda49ceb440 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Fri, 26 Sep 2014 16:08:12 +0200 Subject: [PATCH 1/4] adding first version of CPack for debs --- CMakeLists.txt | 15 ++++++++++++++- app/avInfo/CMakeLists.txt | 2 ++ app/avMeta/CMakeLists.txt | 2 ++ app/avTranscoder/CMakeLists.txt | 2 ++ app/avplay/CMakeLists.txt | 2 ++ app/genericProcessor/CMakeLists.txt | 2 ++ app/optionChecker/CMakeLists.txt | 1 + app/presetChecker/CMakeLists.txt | 2 ++ src/CMakeLists.txt | 18 ++++++++++++++---- 9 files changed, 41 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5911127..57c9560c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(AvTranscoder) +project(avtranscoder) # Set AvTranscoder versions set(AVTRANSCODER_VERSION_MAJOR "0") @@ -26,5 +26,18 @@ else() endif() +# CPack options +SET(CPACK_DEB_COMPONENT_INSTALL 1) +set(CPACK_INSTALL_PREFIX "/usr") +set(CPACK_PACKAGING_INSTALL_PREFIX "/usr") + add_subdirectory(src) add_subdirectory(app) + +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 "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12)") + +INCLUDE(CPack) + diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt index a79cf781..971dc540 100644 --- a/app/avInfo/CMakeLists.txt +++ b/app/avInfo/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}/avinfo.man RENAME "avinfo.1" DESTINATION "share/man/man1/" + COMPONENT tools ) diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt index 3f888824..86810c26 100644 --- 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/avTranscoder/CMakeLists.txt b/app/avTranscoder/CMakeLists.txt index b6b1fc0a..1e16d14b 100644 --- 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/avplay/CMakeLists.txt b/app/avplay/CMakeLists.txt index 6236ae47..c69c5f34 100644 --- 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 index a673e03c..0ab1529b 100644 --- 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/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt index e3182458..007f402b 100644 --- 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/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt index deb50df5..184b285a 100644 --- 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/src/CMakeLists.txt b/src/CMakeLists.txt index 6e6d80a1..8d6860d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,20 +37,25 @@ target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES}) ### Install AvTranscoder libs and include install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/AvTranscoder" - DESTINATION "include/" + DESTINATION "include" + COMPONENT "dev" FILES_MATCHING PATTERN "*.hpp" PATTERN "*.i" PATTERN "Profiles" EXCLUDE ) -set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib") + +set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib" ) + install( DIRECTORY "${LIBRARY_OUTPUT_PATH}" - DESTINATION "${CMAKE_INSTALL_PREFIX}" + DESTINATION "." + COMPONENT "lib" ) ### SWIG find_package(SWIG) + if(SWIG_FOUND) # Load Modules/UseSWIG.cmake include(${SWIG_USE_FILE}) @@ -96,6 +101,7 @@ if(SWIG_FOUND) FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} RENAME "avtranscoder.py" DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/avtranscoder/" + COMPONENT python ) else() message("PYTHON not found, will not build python binding.") @@ -135,7 +141,11 @@ if(SWIG_FOUND) ) # Install jar file - install(FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} DESTINATION "share/java/") + install( + FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} + DESTINATION "share/java/" + COMPONENT java + ) else() message("JAVA not found, will not build java binding.") endif() From 9a6a2b177870420db8278f18f7888711f04bd0f6 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Fri, 26 Sep 2014 16:55:33 +0200 Subject: [PATCH 2/4] fix some issues for deb packaging Conflicts: src/CMakeLists.txt --- app/avInfo/CMakeLists.txt | 6 ++--- src/CMakeLists.txt | 47 +++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt index 971dc540..fd65faca 100644 --- a/app/avInfo/CMakeLists.txt +++ b/app/avInfo/CMakeLists.txt @@ -20,13 +20,13 @@ endif() install( FILES ${BINARY_FILES} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE - DESTINATION "bin/" - COMPONENT tools + 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/src/CMakeLists.txt b/src/CMakeLists.txt index 8d6860d7..8cdf5ec0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,10 +17,10 @@ endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FFMPEG_INCLUDE_DIR}) # Create 'avtranscoder' static lib -add_library(avtranscoder-static STATIC ${AVTRANSCODER_SRC_FILES}) -set_target_properties(avtranscoder-static PROPERTIES LINKER_LANGUAGE CXX) -set_target_properties(avtranscoder-static PROPERTIES OUTPUT_NAME avtranscoder) -target_link_libraries(avtranscoder-static ${FFMPEG_LIBRARIES}) +add_library(avtranscoder-dev STATIC ${AVTRANSCODER_SRC_FILES}) +set_target_properties(avtranscoder-dev PROPERTIES LINKER_LANGUAGE CXX) +set_target_properties(avtranscoder-dev PROPERTIES OUTPUT_NAME avtranscoder) +target_link_libraries(avtranscoder-dev ${FFMPEG_LIBRARIES}) # Create 'avtranscoder' shared lib add_library(avtranscoder-shared SHARED ${AVTRANSCODER_SRC_FILES}) @@ -38,7 +38,7 @@ target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES}) install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/AvTranscoder" DESTINATION "include" - COMPONENT "dev" + COMPONENT "dev" FILES_MATCHING PATTERN "*.hpp" PATTERN "*.i" @@ -48,9 +48,15 @@ install( set(LIBRARY_OUTPUT_PATH "${PROJECT_BINARY_DIR}/lib" ) install( - DIRECTORY "${LIBRARY_OUTPUT_PATH}" - DESTINATION "." - COMPONENT "lib" + TARGETS avtranscoder-dev + DESTINATION "lib" + COMPONENT "dev" +) + +install( + TARGETS avtranscoder-shared + DESTINATION "lib" + COMPONENT "lib" ) ### SWIG @@ -97,11 +103,18 @@ if(SWIG_FOUND) # Install python interface set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/AvTranscoder.py") + install( FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} RENAME "avtranscoder.py" DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/avtranscoder/" - COMPONENT python + COMPONENT "python" + ) + + install( + TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} + DESTINATION "lib" + COMPONENT "python" ) else() message("PYTHON not found, will not build python binding.") @@ -132,7 +145,7 @@ if(SWIG_FOUND) set(AVTRANSCODER_JAR_PATH "${PROJECT_BINARY_DIR}/src") set(AVTRANSCODER_JAR_NAME "avtranscoder-${AVTRANSCODER_VERSION}.jar") execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH}) - + ADD_CUSTOM_COMMAND( TARGET avtranscoder-java POST_BUILD @@ -142,10 +155,16 @@ if(SWIG_FOUND) # Install jar file install( - FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} - DESTINATION "share/java/" - COMPONENT java - ) + FILES ${AVTRANSCODER_JAR_PATH}/${AVTRANSCODER_JAR_NAME} + DESTINATION "share/java/" + COMPONENT "java" + ) + + install( + TARGETS avtranscoder-java + DESTINATION "lib" + COMPONENT "java" + ) else() message("JAVA not found, will not build java binding.") endif() From 6656a65f173a72de79ab786a5b6049698439678e Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Fri, 26 Sep 2014 17:56:00 +0200 Subject: [PATCH 3/4] adding some dependencies --- CMakeLists.txt | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57c9560c..2438244f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,13 +31,30 @@ 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) -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 "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12)") - -INCLUDE(CPack) +include(CPack) From 24a2dd815e8f999d1ef17ef7df28f3fb8942ccfe Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Wed, 22 Oct 2014 17:53:54 +0200 Subject: [PATCH 4/4] change avTranscoder and AvTranscoder to avtranscoder Conflicts: src/AvTranscoder/avTranscoder.i src/CMakeLists.txt --- CMakeLists.txt | 4 +- app/avInfo/avInfo.cpp | 2 +- app/avMeta/CMakeLists.txt | 2 +- app/avMeta/avMeta.cpp | 6 +- app/avTranscoder/CMakeLists.txt | 4 +- app/avTranscoder/avTranscoder.cpp | 18 ++-- app/avplay/AvReader.hpp | 12 +-- app/avplay/CMakeLists.txt | 4 +- app/genericProcessor/CMakeLists.txt | 4 +- app/genericProcessor/genericProcessor.cpp | 4 +- app/jTranscoder/jTranscoder.java | 2 +- app/optionChecker/optionChecker.cpp | 10 +- app/presetChecker/presetChecker.cpp | 6 +- app/pyProcessor/pyProcessor.py | 10 +- cmake/AvTranscoderMacros.cmake | 2 +- src/AvTranscoder/progress/progress.i | 14 --- src/CMakeLists.txt | 14 +-- .../Library.cpp | 0 .../Library.hpp | 0 .../Profile.cpp | 10 +- .../Profile.hpp | 0 src/avtranscoder/avtranscoder.i | 100 ++++++++++++++++++ .../codedStream/AvInputStream.cpp | 2 +- .../codedStream/AvInputStream.hpp | 0 .../codedStream/AvOutputStream.cpp | 2 +- .../codedStream/AvOutputStream.hpp | 0 .../codedStream/IInputStream.hpp | 8 +- .../codedStream/IOutputStream.hpp | 6 +- src/{AvTranscoder => avtranscoder}/common.cpp | 0 src/{AvTranscoder => avtranscoder}/common.hpp | 0 .../essenceStream/AvInputAudio.cpp | 4 +- .../essenceStream/AvInputAudio.hpp | 2 +- .../essenceStream/AvInputVideo.cpp | 6 +- .../essenceStream/AvInputVideo.hpp | 4 +- .../essenceStream/AvOutputAudio.cpp | 2 +- .../essenceStream/AvOutputAudio.hpp | 4 +- .../essenceStream/AvOutputVideo.cpp | 4 +- .../essenceStream/AvOutputVideo.hpp | 6 +- .../essenceStream/GeneratorAudio.cpp | 0 .../essenceStream/GeneratorAudio.hpp | 2 +- .../essenceStream/GeneratorVideo.cpp | 2 +- .../essenceStream/GeneratorVideo.hpp | 2 +- .../essenceStream/IInputEssence.hpp | 4 +- .../essenceStream/IOutputEssence.hpp | 4 +- .../file/InputFile.cpp | 15 ++- .../file/InputFile.hpp | 19 ++-- .../file/OutputFile.cpp | 2 +- .../file/OutputFile.hpp | 18 ++-- .../AttachementStreamProperty.hpp | 0 .../mediaProperty/AudioStreamProperty.hpp | 2 +- .../mediaProperty/DataStreamProperty.hpp | 0 .../mediaProperty/SubtitleStreamProperty.hpp | 0 .../mediaProperty/UnknownStreamProperty.hpp | 0 .../mediaProperty/VideoStreamProperty.hpp | 0 .../mediaProperty/mediaProperty.cpp | 0 .../mediaProperty/mediaProperty.hpp | 2 +- .../mediaProperty/printMediaProperty.hpp | 2 +- .../option/Option.cpp | 0 .../option/Option.hpp | 2 +- .../profile/Avi.hpp | 4 +- .../profile/DNxHD.hpp | 4 +- .../profile/Mkv.hpp | 4 +- .../profile/Wave.hpp | 4 +- .../profile/XdCamHd422.hpp | 4 +- .../progress/ConsoleProgress.cpp | 0 .../progress/ConsoleProgress.hpp | 0 .../progress/IProgress.hpp | 2 +- .../progress/NoDisplayProgress.hpp | 0 src/avtranscoder/progress/progress.i | 14 +++ .../swig/avException.i | 0 .../swig/avExport.i | 0 .../transcoder/StreamTranscoder.cpp | 18 ++-- .../transcoder/StreamTranscoder.hpp | 14 +-- .../transcoder/Transcoder.cpp | 0 .../transcoder/Transcoder.hpp | 18 ++-- 75 files changed, 265 insertions(+), 175 deletions(-) delete mode 100644 src/AvTranscoder/progress/progress.i rename src/{AvTranscoder => avtranscoder}/Library.cpp (100%) rename src/{AvTranscoder => avtranscoder}/Library.hpp (100%) rename src/{AvTranscoder => avtranscoder}/Profile.cpp (94%) rename src/{AvTranscoder => avtranscoder}/Profile.hpp (100%) create mode 100644 src/avtranscoder/avtranscoder.i rename src/{AvTranscoder => avtranscoder}/codedStream/AvInputStream.cpp (99%) rename src/{AvTranscoder => avtranscoder}/codedStream/AvInputStream.hpp (100%) rename src/{AvTranscoder => avtranscoder}/codedStream/AvOutputStream.cpp (90%) rename src/{AvTranscoder => avtranscoder}/codedStream/AvOutputStream.hpp (100%) rename src/{AvTranscoder => avtranscoder}/codedStream/IInputStream.hpp (79%) rename src/{AvTranscoder => avtranscoder}/codedStream/IOutputStream.hpp (70%) rename src/{AvTranscoder => avtranscoder}/common.cpp (100%) rename src/{AvTranscoder => avtranscoder}/common.hpp (100%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvInputAudio.cpp (97%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvInputAudio.hpp (93%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvInputVideo.cpp (96%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvInputVideo.hpp (89%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvOutputAudio.cpp (99%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvOutputAudio.hpp (89%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvOutputVideo.cpp (98%) rename src/{AvTranscoder => avtranscoder}/essenceStream/AvOutputVideo.hpp (76%) rename src/{AvTranscoder => avtranscoder}/essenceStream/GeneratorAudio.cpp (100%) rename src/{AvTranscoder => avtranscoder}/essenceStream/GeneratorAudio.hpp (93%) rename src/{AvTranscoder => avtranscoder}/essenceStream/GeneratorVideo.cpp (96%) rename src/{AvTranscoder => avtranscoder}/essenceStream/GeneratorVideo.hpp (93%) rename src/{AvTranscoder => avtranscoder}/essenceStream/IInputEssence.hpp (90%) rename src/{AvTranscoder => avtranscoder}/essenceStream/IOutputEssence.hpp (92%) rename src/{AvTranscoder => avtranscoder}/file/InputFile.cpp (93%) rename src/{AvTranscoder => avtranscoder}/file/InputFile.hpp (91%) rename src/{AvTranscoder => avtranscoder}/file/OutputFile.cpp (99%) rename src/{AvTranscoder => avtranscoder}/file/OutputFile.hpp (90%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/AttachementStreamProperty.hpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/AudioStreamProperty.hpp (95%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/DataStreamProperty.hpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/SubtitleStreamProperty.hpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/UnknownStreamProperty.hpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/VideoStreamProperty.hpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/mediaProperty.cpp (100%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/mediaProperty.hpp (99%) rename src/{AvTranscoder => avtranscoder}/mediaProperty/printMediaProperty.hpp (99%) rename src/{AvTranscoder => avtranscoder}/option/Option.cpp (100%) rename src/{AvTranscoder => avtranscoder}/option/Option.hpp (98%) rename src/{AvTranscoder => avtranscoder}/profile/Avi.hpp (83%) rename src/{AvTranscoder => avtranscoder}/profile/DNxHD.hpp (94%) rename src/{AvTranscoder => avtranscoder}/profile/Mkv.hpp (82%) rename src/{AvTranscoder => avtranscoder}/profile/Wave.hpp (96%) rename src/{AvTranscoder => avtranscoder}/profile/XdCamHd422.hpp (96%) rename src/{AvTranscoder => avtranscoder}/progress/ConsoleProgress.cpp (100%) rename src/{AvTranscoder => avtranscoder}/progress/ConsoleProgress.hpp (100%) rename src/{AvTranscoder => avtranscoder}/progress/IProgress.hpp (96%) rename src/{AvTranscoder => avtranscoder}/progress/NoDisplayProgress.hpp (100%) create mode 100644 src/avtranscoder/progress/progress.i rename src/{AvTranscoder => avtranscoder}/swig/avException.i (100%) rename src/{AvTranscoder => avtranscoder}/swig/avExport.i (100%) rename src/{AvTranscoder => avtranscoder}/transcoder/StreamTranscoder.cpp (95%) rename src/{AvTranscoder => avtranscoder}/transcoder/StreamTranscoder.hpp (88%) rename src/{AvTranscoder => avtranscoder}/transcoder/Transcoder.cpp (100%) rename src/{AvTranscoder => avtranscoder}/transcoder/Transcoder.hpp (93%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2438244f..3ab542db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 2.8) 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}) diff --git a/app/avInfo/avInfo.cpp b/app/avInfo/avInfo.cpp index 004ed582..7acfcfc4 100644 --- a/app/avInfo/avInfo.cpp +++ b/app/avInfo/avInfo.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include int main( int argc, char** argv ) { diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt index 86810c26..3212a3e9 100644 --- a/app/avMeta/CMakeLists.txt +++ b/app/avMeta/CMakeLists.txt @@ -21,7 +21,7 @@ install( FILES ${BINARY_FILES} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE DESTINATION "bin/" - COMPONENT tools + COMPONENT tools ) install( diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp index d74e4ae9..b023e0d5 100644 --- a/app/avMeta/avMeta.cpp +++ b/app/avMeta/avMeta.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include -#include +#include #include diff --git a/app/avTranscoder/CMakeLists.txt b/app/avTranscoder/CMakeLists.txt index 1e16d14b..a55f4ac5 100644 --- a/app/avTranscoder/CMakeLists.txt +++ b/app/avTranscoder/CMakeLists.txt @@ -21,12 +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 + COMPONENT tools ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man RENAME av++.1 DESTINATION "share/man/man1/" - COMPONENT tools + COMPONENT tools ) diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp index 1ad0cf03..d4beb054 100644 --- a/app/avTranscoder/avTranscoder.cpp +++ b/app/avTranscoder/avTranscoder.cpp @@ -2,19 +2,19 @@ #include #include -#include -#include +#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include void transcodeVideo( const char* inputfilename, const char* outputFilename ) { diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp index 5cda2c80..ea56cabc 100644 --- a/app/avplay/AvReader.hpp +++ b/app/avplay/AvReader.hpp @@ -1,13 +1,13 @@ #ifndef _AVPLAYER_AVREADER_ #define _AVPLAYER_AVREADER_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include "Reader.hpp" diff --git a/app/avplay/CMakeLists.txt b/app/avplay/CMakeLists.txt index c69c5f34..00d989e1 100644 --- a/app/avplay/CMakeLists.txt +++ b/app/avplay/CMakeLists.txt @@ -43,12 +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 + COMPONENT tools ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man RENAME avplayer.1 DESTINATION "share/man/man1/" - COMPONENT tools + COMPONENT tools ) diff --git a/app/genericProcessor/CMakeLists.txt b/app/genericProcessor/CMakeLists.txt index 0ab1529b..21fb159d 100644 --- a/app/genericProcessor/CMakeLists.txt +++ b/app/genericProcessor/CMakeLists.txt @@ -21,12 +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 + COMPONENT tools ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man RENAME avprocessor.1 DESTINATION "share/man/man1/" - COMPONENT tools + COMPONENT tools ) diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp index 37d43cf2..24ed32c3 100644 --- a/app/genericProcessor/genericProcessor.cpp +++ b/app/genericProcessor/genericProcessor.cpp @@ -1,6 +1,6 @@ -#include +#include -#include +#include #include #include diff --git a/app/jTranscoder/jTranscoder.java b/app/jTranscoder/jTranscoder.java index 099736ff..c06121d3 100644 --- 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/optionChecker.cpp b/app/optionChecker/optionChecker.cpp index 36ad707b..68817470 100644 --- a/app/optionChecker/optionChecker.cpp +++ b/app/optionChecker/optionChecker.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp index f921f25f..98abc8fe 100644 --- a/app/presetChecker/presetChecker.cpp +++ b/app/presetChecker/presetChecker.cpp @@ -1,10 +1,10 @@ #include #include -#include +#include -#include -#include +#include +#include int main( int argc, char** argv ) diff --git a/app/pyProcessor/pyProcessor.py b/app/pyProcessor/pyProcessor.py index 393e0c0e..f415172e 100644 --- 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 index 4794bd21..223c572f 100644 --- 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 deleted file mode 100644 index 7bd30a37..00000000 --- a/src/AvTranscoder/progress/progress.i +++ /dev/null @@ -1,14 +0,0 @@ -%{ - #include - #include - #include - #include -%} - -/* turn on director wrapping for IProgress */ -%feature("director") IProgress; - -%include -%include -%include -%include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cdf5ec0..75d85e52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,7 +13,7 @@ else() add_definitions(-DFF_RESAMPLE_LIBRARY) endif() -# Include AvTranscoder and FFmpeg +# Include avtranscoder and FFmpeg include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FFMPEG_INCLUDE_DIR}) # Create 'avtranscoder' static lib @@ -34,9 +34,9 @@ set_target_properties(avtranscoder-shared PROPERTIES SOVERSION ${AVTRANSCODER_VE set_target_properties(avtranscoder-shared PROPERTIES VERSION ${AVTRANSCODER_VERSION}) target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES}) -### Install AvTranscoder libs and include +# Install avtranscoder libs and include install( - DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/AvTranscoder" + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/avtranscoder" DESTINATION "include" COMPONENT "dev" FILES_MATCHING @@ -67,8 +67,8 @@ if(SWIG_FOUND) include(${SWIG_USE_FILE}) # Configure Swig - set(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/AvTranscoder") - set(AVTRANSCODER_BINDING_FILE "AvTranscoder/avTranscoder.i") + set(CMAKE_SWIG_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder") + set(AVTRANSCODER_BINDING_FILE "avtranscoder/avtranscoder.i") set_source_files_properties(${AVTRANSCODER_BINDING_FILE} PROPERTIES CPLUSPLUS ON) ### PYTHON BINDING @@ -102,7 +102,7 @@ if(SWIG_FOUND) swig_link_libraries(avtranscoder-py avtranscoder-shared ${PYTHON_LIBRARIES}) # Install python interface - set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/AvTranscoder.py") + set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/avtranscoder.py") install( FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} @@ -140,7 +140,7 @@ if(SWIG_FOUND) swig_link_libraries(avtranscoder-java avtranscoder-shared) # Post build of java binding : compile java files (generate class files) and create jar - set(AVTRANSCODER_JAVA_OUTPUT_PATH "${PROJECT_BINARY_DIR}/src/AvTranscoder") + set(AVTRANSCODER_JAVA_OUTPUT_PATH "${PROJECT_BINARY_DIR}/src/avtranscoder") set(AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH "${AVTRANSCODER_JAVA_OUTPUT_PATH}/target") set(AVTRANSCODER_JAR_PATH "${PROJECT_BINARY_DIR}/src") set(AVTRANSCODER_JAR_NAME "avtranscoder-${AVTRANSCODER_VERSION}.jar") diff --git a/src/AvTranscoder/Library.cpp b/src/avtranscoder/Library.cpp similarity index 100% rename from src/AvTranscoder/Library.cpp rename to src/avtranscoder/Library.cpp diff --git a/src/AvTranscoder/Library.hpp b/src/avtranscoder/Library.hpp similarity index 100% rename from src/AvTranscoder/Library.hpp rename to src/avtranscoder/Library.hpp diff --git a/src/AvTranscoder/Profile.cpp b/src/avtranscoder/Profile.cpp similarity index 94% rename from src/AvTranscoder/Profile.cpp rename to src/avtranscoder/Profile.cpp index d9005b52..e7375238 100644 --- a/src/AvTranscoder/Profile.cpp +++ b/src/avtranscoder/Profile.cpp @@ -2,11 +2,11 @@ #include "common.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/AvTranscoder/Profile.hpp b/src/avtranscoder/Profile.hpp similarity index 100% rename from src/AvTranscoder/Profile.hpp rename to src/avtranscoder/Profile.hpp diff --git a/src/avtranscoder/avtranscoder.i b/src/avtranscoder/avtranscoder.i new file mode 100644 index 00000000..2a6b5e8c --- /dev/null +++ b/src/avtranscoder/avtranscoder.i @@ -0,0 +1,100 @@ +%module avtranscoder + +%module(directors="1") avtranscoder + +%include "std_string.i" +%include "std_vector.i" +%include "std_pair.i" +%include "std_map.i" + +%include "avtranscoder/swig/avException.i" +%include "avtranscoder/swig/avExport.i" + +%{ +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include + +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include +%} + +namespace std { +%template(IntPair) pair< size_t, size_t >; +%template(VideoVector) vector< avtranscoder::VideoProperties >; +%template(AudioVector) vector< avtranscoder::AudioProperties >; +%template(MetadataPair) pair< string, string >; +%template(MetadatasVector) vector< pair< string, string > >; +%template(GopPair) pair< char, bool >; +%template(GopVector) vector< pair< char, bool > >; +%template(ChannelVector) vector< avtranscoder::Channel >; +%template(ProfileMap) map< string, string >; +%template(ProfilesVector) vector< map< string, string > >; +} + +%include "avtranscoder/progress/progress.i" + +%include + +%include +%include +%include +%include + +%include +%include +%include +%include + +%include + +%include + +%include +%include + +%include +%include + +%include +%include +%include + +%include +%include +%include + +%include +%include + +%include +%include diff --git a/src/AvTranscoder/codedStream/AvInputStream.cpp b/src/avtranscoder/codedStream/AvInputStream.cpp similarity index 99% rename from src/AvTranscoder/codedStream/AvInputStream.cpp rename to src/avtranscoder/codedStream/AvInputStream.cpp index 3f143b7f..f75194f3 100644 --- a/src/AvTranscoder/codedStream/AvInputStream.cpp +++ b/src/avtranscoder/codedStream/AvInputStream.cpp @@ -1,6 +1,6 @@ #include "AvInputStream.hpp" -#include +#include extern "C" { #include diff --git a/src/AvTranscoder/codedStream/AvInputStream.hpp b/src/avtranscoder/codedStream/AvInputStream.hpp similarity index 100% rename from src/AvTranscoder/codedStream/AvInputStream.hpp rename to src/avtranscoder/codedStream/AvInputStream.hpp diff --git a/src/AvTranscoder/codedStream/AvOutputStream.cpp b/src/avtranscoder/codedStream/AvOutputStream.cpp similarity index 90% rename from src/AvTranscoder/codedStream/AvOutputStream.cpp rename to src/avtranscoder/codedStream/AvOutputStream.cpp index 84f480b3..56cdf49d 100644 --- a/src/AvTranscoder/codedStream/AvOutputStream.cpp +++ b/src/avtranscoder/codedStream/AvOutputStream.cpp @@ -1,6 +1,6 @@ #include "AvOutputStream.hpp" -#include +#include #include diff --git a/src/AvTranscoder/codedStream/AvOutputStream.hpp b/src/avtranscoder/codedStream/AvOutputStream.hpp similarity index 100% rename from src/AvTranscoder/codedStream/AvOutputStream.hpp rename to src/avtranscoder/codedStream/AvOutputStream.hpp diff --git a/src/AvTranscoder/codedStream/IInputStream.hpp b/src/avtranscoder/codedStream/IInputStream.hpp similarity index 79% rename from src/AvTranscoder/codedStream/IInputStream.hpp rename to src/avtranscoder/codedStream/IInputStream.hpp index 1557b0e7..1e08675a 100644 --- a/src/AvTranscoder/codedStream/IInputStream.hpp +++ b/src/avtranscoder/codedStream/IInputStream.hpp @@ -1,10 +1,10 @@ #ifndef _AV_TRANSCODER_CODED_STREAM_I_INPUT_STREAM_HPP_ #define _AV_TRANSCODER_CODED_STREAM_I_INPUT_STREAM_HPP_ -#include -#include -#include -#include +#include +#include +#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/codedStream/IOutputStream.hpp b/src/avtranscoder/codedStream/IOutputStream.hpp similarity index 70% rename from src/AvTranscoder/codedStream/IOutputStream.hpp rename to src/avtranscoder/codedStream/IOutputStream.hpp index 3d80fab7..a333d02d 100644 --- a/src/AvTranscoder/codedStream/IOutputStream.hpp +++ b/src/avtranscoder/codedStream/IOutputStream.hpp @@ -1,9 +1,9 @@ #ifndef _AV_TRANSCODER_CODED_STREAM_I_OUTPUT_STREAM_HPP_ #define _AV_TRANSCODER_CODED_STREAM_I_OUTPUT_STREAM_HPP_ -#include -#include -#include +#include +#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/common.cpp b/src/avtranscoder/common.cpp similarity index 100% rename from src/AvTranscoder/common.cpp rename to src/avtranscoder/common.cpp diff --git a/src/AvTranscoder/common.hpp b/src/avtranscoder/common.hpp similarity index 100% rename from src/AvTranscoder/common.hpp rename to src/avtranscoder/common.hpp diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/avtranscoder/essenceStream/AvInputAudio.cpp similarity index 97% rename from src/AvTranscoder/essenceStream/AvInputAudio.cpp rename to src/avtranscoder/essenceStream/AvInputAudio.cpp index 0187f20e..1958ceb8 100644 --- a/src/AvTranscoder/essenceStream/AvInputAudio.cpp +++ b/src/avtranscoder/essenceStream/AvInputAudio.cpp @@ -8,8 +8,8 @@ extern "C" { #include } -#include -#include +#include +#include #include #include diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/avtranscoder/essenceStream/AvInputAudio.hpp similarity index 93% rename from src/AvTranscoder/essenceStream/AvInputAudio.hpp rename to src/avtranscoder/essenceStream/AvInputAudio.hpp index 394fbf0d..779211e4 100644 --- a/src/AvTranscoder/essenceStream/AvInputAudio.hpp +++ b/src/avtranscoder/essenceStream/AvInputAudio.hpp @@ -2,7 +2,7 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_AUDIO_HPP_ #include "IInputEssence.hpp" -#include +#include struct AVFrame; diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/avtranscoder/essenceStream/AvInputVideo.cpp similarity index 96% rename from src/AvTranscoder/essenceStream/AvInputVideo.cpp rename to src/avtranscoder/essenceStream/AvInputVideo.cpp index c1004cdc..d2d94454 100644 --- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp +++ b/src/avtranscoder/essenceStream/AvInputVideo.cpp @@ -1,8 +1,8 @@ #include "AvInputVideo.hpp" -#include -#include -#include +#include +#include +#include extern "C" { #include diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.hpp b/src/avtranscoder/essenceStream/AvInputVideo.hpp similarity index 89% rename from src/AvTranscoder/essenceStream/AvInputVideo.hpp rename to src/avtranscoder/essenceStream/AvInputVideo.hpp index 098edc24..67cfef7a 100644 --- a/src/AvTranscoder/essenceStream/AvInputVideo.hpp +++ b/src/avtranscoder/essenceStream/AvInputVideo.hpp @@ -2,8 +2,8 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_AV_INPUT_VIDEO_HPP_ #include "IInputEssence.hpp" -#include -#include +#include +#include struct AVFrame; diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp b/src/avtranscoder/essenceStream/AvOutputAudio.cpp similarity index 99% rename from src/AvTranscoder/essenceStream/AvOutputAudio.cpp rename to src/avtranscoder/essenceStream/AvOutputAudio.cpp index e1fbf756..7001e7e2 100644 --- a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp +++ b/src/avtranscoder/essenceStream/AvOutputAudio.cpp @@ -1,6 +1,6 @@ #include "AvOutputAudio.hpp" -#include +#include extern "C" { #include diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.hpp b/src/avtranscoder/essenceStream/AvOutputAudio.hpp similarity index 89% rename from src/AvTranscoder/essenceStream/AvOutputAudio.hpp rename to src/avtranscoder/essenceStream/AvOutputAudio.hpp index 2bdc0e51..9838f8e8 100644 --- a/src/AvTranscoder/essenceStream/AvOutputAudio.hpp +++ b/src/avtranscoder/essenceStream/AvOutputAudio.hpp @@ -2,8 +2,8 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_AUDIO_HPP_ #include "IOutputEssence.hpp" -#include -#include +#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp b/src/avtranscoder/essenceStream/AvOutputVideo.cpp similarity index 98% rename from src/AvTranscoder/essenceStream/AvOutputVideo.cpp rename to src/avtranscoder/essenceStream/AvOutputVideo.cpp index 0c636e15..16227eea 100644 --- a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp +++ b/src/avtranscoder/essenceStream/AvOutputVideo.cpp @@ -1,6 +1,6 @@ #include "AvOutputVideo.hpp" -#include +#include extern "C" { #include @@ -172,7 +172,7 @@ bool AvOutputVideo::encodeFrame( Frame& codedFrame ) #endif } -void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& frameDesc ) +void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const VideoFrameDesc& frameDesc ) { if( ! desc.count( constants::avProfileCodec ) || ! desc.count( constants::avProfilePixelFormat ) || diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.hpp b/src/avtranscoder/essenceStream/AvOutputVideo.hpp similarity index 76% rename from src/AvTranscoder/essenceStream/AvOutputVideo.hpp rename to src/avtranscoder/essenceStream/AvOutputVideo.hpp index a41a82b5..cc5162a7 100644 --- a/src/AvTranscoder/essenceStream/AvOutputVideo.hpp +++ b/src/avtranscoder/essenceStream/AvOutputVideo.hpp @@ -2,8 +2,8 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_AV_OUTPUT_VIDEO_HPP_ #include "IOutputEssence.hpp" -#include -#include +#include +#include namespace avtranscoder { @@ -25,7 +25,7 @@ class AvExport AvOutputVideo : public IOutputEssence */ bool encodeFrame( Frame& codedFrame ); - void setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& frameDesc ); + void setProfile( const Profile::ProfileDesc& desc, const VideoFrameDesc& frameDesc ); ICodec& getCodec() { return _codec; } VideoCodec& getVideoCodec() { return _codec; } diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/avtranscoder/essenceStream/GeneratorAudio.cpp similarity index 100% rename from src/AvTranscoder/essenceStream/GeneratorAudio.cpp rename to src/avtranscoder/essenceStream/GeneratorAudio.cpp diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/avtranscoder/essenceStream/GeneratorAudio.hpp similarity index 93% rename from src/AvTranscoder/essenceStream/GeneratorAudio.hpp rename to src/avtranscoder/essenceStream/GeneratorAudio.hpp index de152a46..2b485bdc 100644 --- a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp +++ b/src/avtranscoder/essenceStream/GeneratorAudio.hpp @@ -2,7 +2,7 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_AUDIO_HPP_ #include "IInputEssence.hpp" -#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/avtranscoder/essenceStream/GeneratorVideo.cpp similarity index 96% rename from src/AvTranscoder/essenceStream/GeneratorVideo.cpp rename to src/avtranscoder/essenceStream/GeneratorVideo.cpp index 967e285d..6f9abb81 100644 --- a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp +++ b/src/avtranscoder/essenceStream/GeneratorVideo.cpp @@ -1,6 +1,6 @@ #include "GeneratorVideo.hpp" -#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/avtranscoder/essenceStream/GeneratorVideo.hpp similarity index 93% rename from src/AvTranscoder/essenceStream/GeneratorVideo.hpp rename to src/avtranscoder/essenceStream/GeneratorVideo.hpp index 98c1f88a..9c7c5873 100644 --- a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp +++ b/src/avtranscoder/essenceStream/GeneratorVideo.hpp @@ -2,7 +2,7 @@ #define _AV_TRANSCODER_ESSENCE_STREAM_GENERATOR_VIDEO_HPP_ #include "IInputEssence.hpp" -#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/essenceStream/IInputEssence.hpp b/src/avtranscoder/essenceStream/IInputEssence.hpp similarity index 90% rename from src/AvTranscoder/essenceStream/IInputEssence.hpp rename to src/avtranscoder/essenceStream/IInputEssence.hpp index 33f7968a..f595771a 100644 --- a/src/AvTranscoder/essenceStream/IInputEssence.hpp +++ b/src/avtranscoder/essenceStream/IInputEssence.hpp @@ -1,8 +1,8 @@ #ifndef _AV_TRANSCODER_ESSENCE_STREAM_IINPUT_ESSENCE_HPP_ #define _AV_TRANSCODER_ESSENCE_STREAM_IINPUT_ESSENCE_HPP_ -#include -#include +#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/essenceStream/IOutputEssence.hpp b/src/avtranscoder/essenceStream/IOutputEssence.hpp similarity index 92% rename from src/AvTranscoder/essenceStream/IOutputEssence.hpp rename to src/avtranscoder/essenceStream/IOutputEssence.hpp index 4cebb663..f0dd7125 100644 --- a/src/AvTranscoder/essenceStream/IOutputEssence.hpp +++ b/src/avtranscoder/essenceStream/IOutputEssence.hpp @@ -1,8 +1,8 @@ #ifndef _AV_TRANSCODER_ESSENCE_STREAM_IOUTPUT_ESSENCE_HPP_ #define _AV_TRANSCODER_ESSENCE_STREAM_IOUTPUT_ESSENCE_HPP_ -#include -#include +#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/avtranscoder/file/InputFile.cpp similarity index 93% rename from src/AvTranscoder/file/InputFile.cpp rename to src/avtranscoder/file/InputFile.cpp index cc1b3db4..23fb0c9b 100644 --- a/src/AvTranscoder/file/InputFile.cpp +++ b/src/avtranscoder/file/InputFile.cpp @@ -1,13 +1,12 @@ #include "InputFile.hpp" -#include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include extern "C" { #include diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/avtranscoder/file/InputFile.hpp similarity index 91% rename from src/AvTranscoder/file/InputFile.hpp rename to src/avtranscoder/file/InputFile.hpp index 1883b220..ff1baaa5 100644 --- a/src/AvTranscoder/file/InputFile.hpp +++ b/src/avtranscoder/file/InputFile.hpp @@ -1,18 +1,13 @@ #ifndef _AV_TRANSCODER_FILE_INPUT_FILE_HPP_ #define _AV_TRANSCODER_FILE_INPUT_FILE_HPP_ -#include - -#include -#include - -#include - -#include - -#include - -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/avtranscoder/file/OutputFile.cpp similarity index 99% rename from src/AvTranscoder/file/OutputFile.cpp rename to src/avtranscoder/file/OutputFile.cpp index 09e19f37..9cf7dc77 100644 --- a/src/AvTranscoder/file/OutputFile.cpp +++ b/src/avtranscoder/file/OutputFile.cpp @@ -1,6 +1,6 @@ #include "OutputFile.hpp" -#include +#include extern "C" { #include diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/avtranscoder/file/OutputFile.hpp similarity index 90% rename from src/AvTranscoder/file/OutputFile.hpp rename to src/avtranscoder/file/OutputFile.hpp index f00b3f82..a9e69d3b 100644 --- a/src/AvTranscoder/file/OutputFile.hpp +++ b/src/avtranscoder/file/OutputFile.hpp @@ -1,17 +1,13 @@ #ifndef _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_ #define _AV_TRANSCODER_FILE_OUTPUT_FILE_HPP_ -#include - -#include - -#include -#include -#include - -#include - -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/AvTranscoder/mediaProperty/AttachementStreamProperty.hpp b/src/avtranscoder/mediaProperty/AttachementStreamProperty.hpp similarity index 100% rename from src/AvTranscoder/mediaProperty/AttachementStreamProperty.hpp rename to src/avtranscoder/mediaProperty/AttachementStreamProperty.hpp diff --git a/src/AvTranscoder/mediaProperty/AudioStreamProperty.hpp b/src/avtranscoder/mediaProperty/AudioStreamProperty.hpp similarity index 95% rename from src/AvTranscoder/mediaProperty/AudioStreamProperty.hpp rename to src/avtranscoder/mediaProperty/AudioStreamProperty.hpp index 35c06c02..36b9305d 100644 --- a/src/AvTranscoder/mediaProperty/AudioStreamProperty.hpp +++ b/src/avtranscoder/mediaProperty/AudioStreamProperty.hpp @@ -12,7 +12,7 @@ extern "C" { namespace avtranscoder { -avtranscoder::AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index ) +AudioProperties audioStreamInfo( const AVFormatContext* formatContext, const size_t index ) { AudioProperties ap; AVCodecContext* codec_context = formatContext->streams[index]->codec; diff --git a/src/AvTranscoder/mediaProperty/DataStreamProperty.hpp b/src/avtranscoder/mediaProperty/DataStreamProperty.hpp similarity index 100% rename from src/AvTranscoder/mediaProperty/DataStreamProperty.hpp rename to src/avtranscoder/mediaProperty/DataStreamProperty.hpp diff --git a/src/AvTranscoder/mediaProperty/SubtitleStreamProperty.hpp b/src/avtranscoder/mediaProperty/SubtitleStreamProperty.hpp similarity index 100% rename from src/AvTranscoder/mediaProperty/SubtitleStreamProperty.hpp rename to src/avtranscoder/mediaProperty/SubtitleStreamProperty.hpp diff --git a/src/AvTranscoder/mediaProperty/UnknownStreamProperty.hpp b/src/avtranscoder/mediaProperty/UnknownStreamProperty.hpp similarity index 100% rename from src/AvTranscoder/mediaProperty/UnknownStreamProperty.hpp rename to src/avtranscoder/mediaProperty/UnknownStreamProperty.hpp diff --git a/src/AvTranscoder/mediaProperty/VideoStreamProperty.hpp b/src/avtranscoder/mediaProperty/VideoStreamProperty.hpp similarity index 100% rename from src/AvTranscoder/mediaProperty/VideoStreamProperty.hpp rename to src/avtranscoder/mediaProperty/VideoStreamProperty.hpp diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.cpp b/src/avtranscoder/mediaProperty/mediaProperty.cpp similarity index 100% rename from src/AvTranscoder/mediaProperty/mediaProperty.cpp rename to src/avtranscoder/mediaProperty/mediaProperty.cpp diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.hpp b/src/avtranscoder/mediaProperty/mediaProperty.hpp similarity index 99% rename from src/AvTranscoder/mediaProperty/mediaProperty.hpp rename to src/avtranscoder/mediaProperty/mediaProperty.hpp index 19163a67..50837e65 100644 --- a/src/AvTranscoder/mediaProperty/mediaProperty.hpp +++ b/src/avtranscoder/mediaProperty/mediaProperty.hpp @@ -1,7 +1,7 @@ #ifndef _AV_TRANSCODER_MEDIA_HPP_ #define _AV_TRANSCODER_MEDIA_HPP_ -#include +#include extern "C" { #include diff --git a/src/AvTranscoder/mediaProperty/printMediaProperty.hpp b/src/avtranscoder/mediaProperty/printMediaProperty.hpp similarity index 99% rename from src/AvTranscoder/mediaProperty/printMediaProperty.hpp rename to src/avtranscoder/mediaProperty/printMediaProperty.hpp index a2a69c80..412ad593 100644 --- a/src/AvTranscoder/mediaProperty/printMediaProperty.hpp +++ b/src/avtranscoder/mediaProperty/printMediaProperty.hpp @@ -1,7 +1,7 @@ #ifndef _AV_TRANSCODER_PRINT_HPP_ #define _AV_TRANSCODER_PRINT_HPP_ -#include +#include #include #include diff --git a/src/AvTranscoder/option/Option.cpp b/src/avtranscoder/option/Option.cpp similarity index 100% rename from src/AvTranscoder/option/Option.cpp rename to src/avtranscoder/option/Option.cpp diff --git a/src/AvTranscoder/option/Option.hpp b/src/avtranscoder/option/Option.hpp similarity index 98% rename from src/AvTranscoder/option/Option.hpp rename to src/avtranscoder/option/Option.hpp index a906871f..8b5418f4 100644 --- a/src/AvTranscoder/option/Option.hpp +++ b/src/avtranscoder/option/Option.hpp @@ -1,7 +1,7 @@ #ifndef _AV_TRANSCODER_OPTION_HPP #define _AV_TRANSCODER_OPTION_HPP -#include +#include extern "C" { #include diff --git a/src/AvTranscoder/profile/Avi.hpp b/src/avtranscoder/profile/Avi.hpp similarity index 83% rename from src/AvTranscoder/profile/Avi.hpp rename to src/avtranscoder/profile/Avi.hpp index e67793e3..9ca9f6d1 100644 --- a/src/AvTranscoder/profile/Avi.hpp +++ b/src/avtranscoder/profile/Avi.hpp @@ -1,5 +1,5 @@ -#ifndef _AVTRANSCODER_PROFIL_AVI_HPP_ -#define _AVTRANSCODER_PROFIL_AVI_HPP_ +#ifndef _AV_TRANSCODER_PROFIL_AVI_HPP_ +#define _AV_TRANSCODER_PROFIL_AVI_HPP_ namespace avtranscoder { diff --git a/src/AvTranscoder/profile/DNxHD.hpp b/src/avtranscoder/profile/DNxHD.hpp similarity index 94% rename from src/AvTranscoder/profile/DNxHD.hpp rename to src/avtranscoder/profile/DNxHD.hpp index 7f9d12bb..f45fdcc1 100644 --- a/src/AvTranscoder/profile/DNxHD.hpp +++ b/src/avtranscoder/profile/DNxHD.hpp @@ -1,5 +1,5 @@ -#ifndef _AVTRANSCODER_PROFIL_DNXHD_HPP_ -#define _AVTRANSCODER_PROFIL_DNXHD_HPP_ +#ifndef _AV_TRANSCODER_PROFIL_DNXHD_HPP_ +#define _AV_TRANSCODER_PROFIL_DNXHD_HPP_ namespace avtranscoder { diff --git a/src/AvTranscoder/profile/Mkv.hpp b/src/avtranscoder/profile/Mkv.hpp similarity index 82% rename from src/AvTranscoder/profile/Mkv.hpp rename to src/avtranscoder/profile/Mkv.hpp index d80f8dff..cf51425b 100644 --- a/src/AvTranscoder/profile/Mkv.hpp +++ b/src/avtranscoder/profile/Mkv.hpp @@ -1,5 +1,5 @@ -#ifndef _AVTRANSCODER_PROFIL_MKV_HPP_ -#define _AVTRANSCODER_PROFIL_MKV_HPP_ +#ifndef _AV_TRANSCODER_PROFIL_MKV_HPP_ +#define _AV_TRANSCODER_PROFIL_MKV_HPP_ namespace avtranscoder { diff --git a/src/AvTranscoder/profile/Wave.hpp b/src/avtranscoder/profile/Wave.hpp similarity index 96% rename from src/AvTranscoder/profile/Wave.hpp rename to src/avtranscoder/profile/Wave.hpp index 62328bb5..62f27952 100644 --- a/src/AvTranscoder/profile/Wave.hpp +++ b/src/avtranscoder/profile/Wave.hpp @@ -1,5 +1,5 @@ -#ifndef _AVTRANSCODER_PROFIL_WAVE_HPP_ -#define _AVTRANSCODER_PROFIL_WAVE_HPP_ +#ifndef _AV_TRANSCODER_PROFIL_WAVE_HPP_ +#define _AV_TRANSCODER_PROFIL_WAVE_HPP_ namespace avtranscoder { diff --git a/src/AvTranscoder/profile/XdCamHd422.hpp b/src/avtranscoder/profile/XdCamHd422.hpp similarity index 96% rename from src/AvTranscoder/profile/XdCamHd422.hpp rename to src/avtranscoder/profile/XdCamHd422.hpp index 82ae8084..c340d62a 100644 --- a/src/AvTranscoder/profile/XdCamHd422.hpp +++ b/src/avtranscoder/profile/XdCamHd422.hpp @@ -1,5 +1,5 @@ -#ifndef _AVTRANSCODER_PROFIL_XDCAMHD422_HPP_ -#define _AVTRANSCODER_PROFIL_XDCAMHD422_HPP_ +#ifndef _AV_TRANSCODER_PROFIL_XDCAMHD422_HPP_ +#define _AV_TRANSCODER_PROFIL_XDCAMHD422_HPP_ namespace avtranscoder { diff --git a/src/AvTranscoder/progress/ConsoleProgress.cpp b/src/avtranscoder/progress/ConsoleProgress.cpp similarity index 100% rename from src/AvTranscoder/progress/ConsoleProgress.cpp rename to src/avtranscoder/progress/ConsoleProgress.cpp diff --git a/src/AvTranscoder/progress/ConsoleProgress.hpp b/src/avtranscoder/progress/ConsoleProgress.hpp similarity index 100% rename from src/AvTranscoder/progress/ConsoleProgress.hpp rename to src/avtranscoder/progress/ConsoleProgress.hpp diff --git a/src/AvTranscoder/progress/IProgress.hpp b/src/avtranscoder/progress/IProgress.hpp similarity index 96% rename from src/AvTranscoder/progress/IProgress.hpp rename to src/avtranscoder/progress/IProgress.hpp index b26729ec..0765900c 100644 --- a/src/AvTranscoder/progress/IProgress.hpp +++ b/src/avtranscoder/progress/IProgress.hpp @@ -1,7 +1,7 @@ #ifndef _AV_TRANSCODER_IPROGRESS_LISTENER_HPP_ #define _AV_TRANSCODER_IPROGRESS_LISTENER_HPP_ -#include +#include #include diff --git a/src/AvTranscoder/progress/NoDisplayProgress.hpp b/src/avtranscoder/progress/NoDisplayProgress.hpp similarity index 100% rename from src/AvTranscoder/progress/NoDisplayProgress.hpp rename to src/avtranscoder/progress/NoDisplayProgress.hpp diff --git a/src/avtranscoder/progress/progress.i b/src/avtranscoder/progress/progress.i new file mode 100644 index 00000000..58476023 --- /dev/null +++ b/src/avtranscoder/progress/progress.i @@ -0,0 +1,14 @@ +%{ + #include + #include + #include + #include +%} + +/* turn on director wrapping for IProgress */ +%feature("director") IProgress; + +%include +%include +%include +%include diff --git a/src/AvTranscoder/swig/avException.i b/src/avtranscoder/swig/avException.i similarity index 100% rename from src/AvTranscoder/swig/avException.i rename to src/avtranscoder/swig/avException.i diff --git a/src/AvTranscoder/swig/avExport.i b/src/avtranscoder/swig/avExport.i similarity index 100% rename from src/AvTranscoder/swig/avExport.i rename to src/avtranscoder/swig/avExport.i diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/avtranscoder/transcoder/StreamTranscoder.cpp similarity index 95% rename from src/AvTranscoder/transcoder/StreamTranscoder.cpp rename to src/avtranscoder/transcoder/StreamTranscoder.cpp index 3491171f..adb470db 100644 --- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp +++ b/src/avtranscoder/transcoder/StreamTranscoder.cpp @@ -1,17 +1,17 @@ #include "StreamTranscoder.hpp" -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/avtranscoder/transcoder/StreamTranscoder.hpp similarity index 88% rename from src/AvTranscoder/transcoder/StreamTranscoder.hpp rename to src/avtranscoder/transcoder/StreamTranscoder.hpp index d3d0aa6e..72806c85 100644 --- a/src/AvTranscoder/transcoder/StreamTranscoder.hpp +++ b/src/avtranscoder/transcoder/StreamTranscoder.hpp @@ -1,17 +1,17 @@ #ifndef _AV_TRANSCODER_STREAM_TRANSCODER_HPP_ #define _AV_TRANSCODER_STREAM_TRANSCODER_HPP_ -#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include -#include +#include namespace avtranscoder { diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/avtranscoder/transcoder/Transcoder.cpp similarity index 100% rename from src/AvTranscoder/transcoder/Transcoder.cpp rename to src/avtranscoder/transcoder/Transcoder.cpp diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/avtranscoder/transcoder/Transcoder.hpp similarity index 93% rename from src/AvTranscoder/transcoder/Transcoder.hpp rename to src/avtranscoder/transcoder/Transcoder.hpp index 66357633..8caaaa17 100644 --- a/src/AvTranscoder/transcoder/Transcoder.hpp +++ b/src/avtranscoder/transcoder/Transcoder.hpp @@ -1,19 +1,19 @@ #ifndef _AV_TRANSCODER_TRANSCODER_HPP_ #define _AV_TRANSCODER_TRANSCODER_HPP_ -#include +#include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include -#include +#include -#include +#include #include "StreamTranscoder.hpp" @@ -28,7 +28,7 @@ namespace avtranscoder * eProcessMethodShortest: stop transcode at the end of the shortest stream. * eProcessMethodLongest: stop transcode at the end of the longest stream (default method). * eProcessMethodBasedOnStream: stop transcode at the end of an indicated stream (@see _indexBasedStream of Transcoder). - * eProcessMethodInfinity: stop transcode by outside of avTranscoder. + * eProcessMethodInfinity: stop transcode by outside of avtranscoder. */ enum EProcessMethod {