- Notifications
You must be signed in to change notification settings - Fork50
External encoder#311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
Uh oh!
There was an error while loading.Please reload this page.
Closed
External encoder#311
Changes fromall commits
Commits
Show all changes
35 commits Select commitHold shift + click to select a range
1c6711e changes to support FFmpeg 4.1
MarcAntoine-Arnaud25431e8 return log file if deps build is in error
MarcAntoine-Arnaud29b30ba add FFmpeg with versions 4
MarcAntoine-Arnaudd49bfd3 remove old FFmpeg versions
MarcAntoine-Arnaud945bbce fix LAME url
MarcAntoine-Arnaud8844df2 use vorbis 1.3.6
MarcAntoine-Arnaud204c866 export PAK_CONFIG_PATH to locate vorbis package definition
MarcAntoine-Arnaud444fdb9 remove vorbis dependency of FFmpeg
MarcAntoine-Arnaud18e9b41 add API to use an external encoder
MarcAntoine-Arnaud77669c8 remove libav on travis
MarcAntoine-Arnaud8f41e27 use nose2
MarcAntoine-Arnauda2015fe switch to nose2 with python3
MarcAntoine-Arnaudfa60ecd pass copy to private
MarcAntoine-Arnaud8ab6660 remove copy of contructors
MarcAntoine-Arnaud57da18e StreamTranscoder: fix output AudioFrameDesc when an encoder is specified
valnoel7bb4af5 Use python3-nose2 to execute tests on Travis
valnoel2dec3a3 Add AvAudioPhaseMeter application
valnoelee64295 Fix unit tests execution with python 3
valnoelee14235 Update appveyor config to use ffmpeg-4.2.1 and python3
valnoeld09f1d0 Add Python3 module for nose tests coverage
valnoel19ac071 Do not install python 3 on Appveyor Windows images
valnoel11b5347 Add Travis nose tests verbose
valnoel9d190de Fix Appveyor FFmpeg download
valnoel673a167 Travis: Don't build with unsupported FFmpeg 4.0
valnoel6967e3d Appveyor: update python version for Swig binding
valnoelac5a66c AppVeyor: fix python call
valnoel6fd8d17 AppVeyor: fix pip call
valnoel02a6ce7 Travis: force python version
valnoel6d5f3c3 Appveyor: fix pip upgrade
valnoelf520222 Appveyor: fix unit tests python call
valnoela3ddbe6 CI: try to fix python version on MacOS and Windows
valnoel18c445f CI: try to force swig python versio, and clean dependency path for MacOS
valnoela3d5833 Travis: allow OSX build failure
valnoel995a83e Travis: enable coverage
valnoelc496a99 Add unit tests
valnoelFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
38 changes: 23 additions & 15 deletions.travis.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletionsCMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionsapp/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletionsapp/avAudioPhaseMeter/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ) |
141 changes: 141 additions & 0 deletionsapp/avAudioPhaseMeter/avAudioPhaseMeter.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletionsapp/customEncoder/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ) |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.