avTranscoder · MarcAntoine-Arnaud · Oct 21, 2019 · Oct 22, 2019 · Oct 22, 2019 · Oct 22, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -25,23 +25,28 @@ env:
      - DEPENDENCY_LOG_FILE=${TRAVIS_BUILD_DIR}/build-dependencies-log.txt
 
      - YASM_VERSION=1.3.0
-     - LAME_VERSION=3.99.5
-     - FAAC_VERSION=1.28
+     - LAME_VERSION=3.100
+     # - FAAC_VERSION=1.28
      - XVID_VERSION=1.3.3
-     - FDKAAC_VERSION=0.1.3
+     # - FDKAAC_VERSION=0.1.3
      - OGG_VERSION=1.3.2
-     - VORBIS_VERSION=1.3.4
-     - THEORA_VERSION=1.1.1
+     - VORBIS_VERSION=1.3.6
+     # - THEORA_VERSION=1.1.1
      - VPX_VERSION=1.4.0
   matrix:
-    - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
-    - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.12 ENABLE_COVERAGE=true
+    # - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.12 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=12.3 ENABLE_COVERAGE=true
+    # - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=12.3 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
+    # - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.0 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.1 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.2 ENABLE_COVERAGE=true
 
 matrix:
   exclude:
@@ -57,6 +62,7 @@ matrix:
       env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
   allow_failures:
     # build with libav
+    - os: osx
     - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
     - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
     # build with ffmpeg-2.8.6
@@ -75,8 +81,10 @@ addons:
     packages:
     - cmake
     - swig
-    - python-dev
-    - python-nose
+    - python3-dev
+    - python3
+    - python3-nose
+    - python3-coverage
     - freeglut3-dev
 
 cache:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,15 @@ cmake_minimum_required(VERSION 2.8.11)
 
 project(AvTranscoder)
 
+# All libraries will be put in INSTALL_PREFIX/lib
+# RPATH of host points INSTALL_PREFIX/lib
+# see: http://www.cmake.org/Wiki/CMake_RPATH_handling
+set(CMAKE_MACOSX_RPATH 1)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+
 # Define AvTranscoder default path to profiles
 add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/avprofiles")
 

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,8 +1,10 @@
 # C++ apps
+add_subdirectory(avAudioPhaseMeter)
 add_subdirectory(avInfo)
 add_subdirectory(avMeta)
 add_subdirectory(avPlayer)
 add_subdirectory(avProcessor)
+add_subdirectory(customEncoder)
 
 # Python apps
 add_subdirectory(pyProcessor)

diff --git a/app/avAudioPhaseMeter/CMakeLists.txt b/app/avAudioPhaseMeter/CMakeLists.txt
@@ -0,0 +1,24 @@
+### cpp/avProcessor
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+add_executable(avaudiophasemeter avAudioPhaseMeter.cpp)
+set_target_properties(avaudiophasemeter PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(avaudiophasemeter avtranscoder-shared)
+
+# Install app
+if(WIN32)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avaudiophasemeter.exe")
+else()
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avaudiophasemeter" "${CMAKE_CURRENT_BINARY_DIR}/avaudiophasemeter-${AVTRANSCODER_VERSION}")
+endif()
+
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+	OPTIONAL
+)
diff --git a/app/avAudioPhaseMeter/avAudioPhaseMeter.cpp b/app/avAudioPhaseMeter/avAudioPhaseMeter.cpp
@@ -0,0 +1,141 @@
+#include <AvTranscoder/transcoder/Transcoder.hpp>
+#include <AvTranscoder/file/OutputFile.hpp>
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
+
+#include <iostream>
+#include <iomanip>
+#include <vector>
+#include <fstream>
+#include <sstream>
+#include <cstdlib>
+
+std::vector<avtranscoder::InputStreamDesc> parseConfigFile(const std::string& configFilename)
+{
+    std::vector<avtranscoder::InputStreamDesc> result;
+
+    std::ifstream configFile(configFilename.c_str(), std::ifstream::in);
+
+    std::string line;
+    size_t countLines = 0;
+    while(std::getline(configFile, line))
+    {
+        if(++countLines > 2)
+            throw std::runtime_error("Audio phase analysis can only be done on a stereo pair, i.e. two channels (see usage).");
+
+        std::istringstream is_line(line);
+        std::string filename;
+        if(std::getline(is_line, filename, '='))
+        {
+            std::string stream;
+            std::getline(is_line, stream);
+
+            std::stringstream ss(stream);
+            size_t streamIndex = 0;
+            char separator;
+            int channelIndex = -1;
+            ss >> streamIndex;
+            ss >> separator;
+            if(separator == '.')
+                ss >> channelIndex;
+
+            bool newInputDescAdded = false;
+            // if we already have an input description with the same filename/streamIndex, add only the new channelIndex
+            for(std::vector<avtranscoder::InputStreamDesc>::iterator it = result.begin(); it != result.end(); ++it)
+            {
+                if(it->_filename == filename && it->_streamIndex == streamIndex)
+                {
+                    it->_channelIndexArray.push_back(channelIndex);
+                    newInputDescAdded = true;
+                    break;
+                }
+            }
+            if(! newInputDescAdded)
+                result.push_back(avtranscoder::InputStreamDesc(filename, streamIndex, channelIndex));
+        }
+    }
+
+    configFile.close();
+
+    return result;
+}
+
+void displayUsage(const std::string& program)
+{
+    std::cout << "Usage: " << program << " CONFIG OUTPUT [OPTIONS]" << std::endl << std::endl;
+    std::cout << "\tCONFIG: input configuration file" << std::endl;
+    std::cout << "\t\tEach line represents one audio stream analysed." << std::endl;
+    std::cout << "\t\tPattern of each line is:" << std::endl;
+    std::cout << "\t\t[inputFile]=STREAM_INDEX.CHANNEL_INDEX" << std::endl;
+    std::cout << "\t\tWARNING: audio phase analyser only support stereo layout, i.e. two lines in this configuration." << std::endl << std::endl;
+    std::cout << "\tOUTPUT: metadata output file" << std::endl;
+    std::cout << "\t\tPattern for each frame is:" << std::endl;
+    std::cout << "\t\t `frame:[FRAME_ID]    pts:[PTS]       pts_time:[PTS_TIME]" << std::endl;
+    std::cout << "\t\t  lavfi.aphasemeter.phase=[PHASE_VALUE]`" << std::endl << std::endl;
+    std::cout << "\tOPTIONS:" << std::endl;
+    std::cout << "\t\t--info     set log level to AV_LOG_INFO" << std::endl;
+    std::cout << "\t\t--debug    set log level to AV_LOG_DEBUG" << std::endl;
+    std::cout << "\t\t--help     display this help" << std::endl << std::endl;
+}
+
+int main(int argc, char** argv)
+{
+    // Preload FFmpeg context
+    avtranscoder::preloadCodecsAndFormats();
+    avtranscoder::Logger::setLogLevel(AV_LOG_QUIET);
+
+    if(argc < 3) {
+        displayUsage(argv[0]);
+    }
+
+    // List command line arguments
+    std::vector<std::string> arguments;
+    for(int argument = 1; argument < argc; ++argument)
+    {
+        arguments.push_back(argv[argument]);
+    }
+    for(size_t argument = 0; argument < arguments.size(); ++argument)
+    {
+        if(arguments.at(argument) == "--help")
+        {
+            displayUsage(argv[0]);
+            return 0;
+        }
+        else if(arguments.at(argument) == "--debug")
+        {
+            avtranscoder::Logger::setLogLevel(AV_LOG_DEBUG);
+        }
+        else if(arguments.at(argument) == "--info")
+        {
+            avtranscoder::Logger::setLogLevel(AV_LOG_INFO);
+        }
+    }
+
+    try
+    {
+        std::string configFilePath(arguments.at(0));
+        std::string outputFilePath(arguments.at(1));
+        std::vector<avtranscoder::InputStreamDesc> inputStreamsToAnalyse = parseConfigFile(configFilePath);
+
+        avtranscoder::OutputFile outputFile(outputFilePath, "null"); // the output file will be overwritten by the extracted metadata
+
+        avtranscoder::Transcoder transcoder(outputFile);
+        transcoder.setProcessMethod(avtranscoder::eProcessMethodBasedOnStream, 0);
+        transcoder.addStream(inputStreamsToAnalyse);
+
+        avtranscoder::StreamTranscoder& streamTranscoder = transcoder.getStreamTranscoder(0);
+        avtranscoder::FilterGraph* filterGraph = streamTranscoder.getFilterGraph();
+        filterGraph->addFilter("aphasemeter", "video=0");
+        filterGraph->addFilter("ametadata", "mode=print:file=" + outputFilePath);
+
+        avtranscoder::ConsoleProgress progress;
+        transcoder.process(progress);
+    }
+    catch(std::exception& e)
+    {
+        std::cerr << "ERROR: during process, an error occured: " << e.what() << std::endl;
+    }
+    catch(...)
+    {
+        std::cerr << "ERROR: during process, an unknown error occured" << std::endl;
+    }
+}
diff --git a/app/customEncoder/CMakeLists.txt b/app/customEncoder/CMakeLists.txt
@@ -0,0 +1,24 @@
+### cpp/customEncoder
+
+# Load custom cmake utilities
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(AvTranscoderMacros)
+
+# Build app
+add_executable(custom-encoder customEncoder.cpp)
+set_target_properties(custom-encoder PROPERTIES VERSION ${AVTRANSCODER_VERSION})
+target_link_libraries(custom-encoder avtranscoder-shared)
+
+# Install app
+if(WIN32)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/custom-encoder.exe")
+else()
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/custom-encoder" "${CMAKE_CURRENT_BINARY_DIR}/custom-encoder-${AVTRANSCODER_VERSION}")
+endif()
+
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+	OPTIONAL
+)