From 561f975c059c6d63bb4ae10ce10f7d5888a54eba Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Aug 2014 14:03:34 +0200 Subject: [PATCH 1/5] StreamTranscoder: refactoring processFrame * If no inputEssence, rewrap. * Else, transcode. --- src/AvTranscoder/Transcoder/StreamTranscoder.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp index 5dca7caa..6ac2a764 100644 --- a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp +++ b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp @@ -251,22 +251,21 @@ StreamTranscoder::~StreamTranscoder() bool StreamTranscoder::processFrame() { ++_frameProcessed; - if( _transform ) + + if( ! _inputEssence ) { if( _subStreamIndex < 0 ) { - return processTranscode(); + return processRewrap(); } - - return processTranscode( _subStreamIndex ); + return processRewrap( _subStreamIndex ); } if( _subStreamIndex < 0 ) { - return processRewrap(); + return processTranscode(); } - - return processRewrap( _subStreamIndex ); + return processTranscode( _subStreamIndex ); } bool StreamTranscoder::processRewrap() From 83cacd30af3603bba39ce7ba764faaaa4bda51eb Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Aug 2014 14:04:28 +0200 Subject: [PATCH 2/5] DummyVideo: update comment Correct NTFC to NTFS. --- src/AvTranscoder/EssenceStream/DummyVideo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp index c1c18bfa..a5f67333 100644 --- a/src/AvTranscoder/EssenceStream/DummyVideo.cpp +++ b/src/AvTranscoder/EssenceStream/DummyVideo.cpp @@ -38,7 +38,7 @@ bool DummyVideo::readNextFrame( Frame& frameBuffer ) { if( ! _inputFrame ) { - // @todo support PAL (0 to 255) and NTFC (16 to 235) + // @todo support PAL (0 to 255) and NTFS (16 to 235) int fillChar = 0; if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() ) From 534aeeb289bea4e00ee70718c4bc680f798b66a3 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Aug 2014 14:11:04 +0200 Subject: [PATCH 3/5] setProfile: uniformize print * Do not print if first wraning (before setup). * Print with [name_of_the_class]. --- src/AvTranscoder/EssenceStream/InputVideo.cpp | 2 +- src/AvTranscoder/EssenceStream/OutputAudio.cpp | 4 ++-- src/AvTranscoder/File/InputFile.cpp | 2 +- src/AvTranscoder/File/OutputFile.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/AvTranscoder/EssenceStream/InputVideo.cpp b/src/AvTranscoder/EssenceStream/InputVideo.cpp index 4fd2a3ad..d0c49855 100644 --- a/src/AvTranscoder/EssenceStream/InputVideo.cpp +++ b/src/AvTranscoder/EssenceStream/InputVideo.cpp @@ -164,7 +164,7 @@ void InputVideo::setProfile( const Profile::ProfileDesc& desc ) } catch( std::exception& e ) { - std::cout << "InputVideo warning: " << e.what() << std::endl; + std::cout << "[InputVideo] warning: " << e.what() << std::endl; } } } diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp index cdaec171..b038d403 100644 --- a/src/AvTranscoder/EssenceStream/OutputAudio.cpp +++ b/src/AvTranscoder/EssenceStream/OutputAudio.cpp @@ -202,7 +202,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame } catch( std::exception& e ) { - std::cout << "OutputAudio warning: " << e.what() << std::endl; + //std::cout << "[OutputAudio] warning: " << e.what() << std::endl; } } @@ -223,7 +223,7 @@ void OutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrame } catch( std::exception& e ) { - std::cout << "OutputAudio 2.warning: " << e.what() << std::endl; + std::cout << "[OutputAudio] warning: " << e.what() << std::endl; } } } diff --git a/src/AvTranscoder/File/InputFile.cpp b/src/AvTranscoder/File/InputFile.cpp index a8bbcd7d..c7770087 100644 --- a/src/AvTranscoder/File/InputFile.cpp +++ b/src/AvTranscoder/File/InputFile.cpp @@ -230,7 +230,7 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc ) } catch( std::exception& e ) { - std::cout << "InputFile warning: " << e.what() << std::endl; + std::cout << "[InputFile] warning: " << e.what() << std::endl; } } } diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp index 1b38e5a1..49b0393b 100644 --- a/src/AvTranscoder/File/OutputFile.cpp +++ b/src/AvTranscoder/File/OutputFile.cpp @@ -252,7 +252,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc ) } catch( std::exception& e ) { - std::cout << "OutputFile warning: " << e.what() << std::endl; + //std::cout << "[OutputFile] warning: " << e.what() << std::endl; } } @@ -272,7 +272,7 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc ) } catch( std::exception& e ) { - std::cout << "OutputFile 2.warning: " << e.what() << std::endl; + std::cout << "[OutputFile] warning: " << e.what() << std::endl; } } } From 6b33f611a24b346c88ec6071f1401d33a9368bf3 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Aug 2014 14:11:47 +0200 Subject: [PATCH 4/5] InputAudio: clean setup * Remove commented prints. * Set _codecContext->channels only once. --- src/AvTranscoder/EssenceStream/InputAudio.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/AvTranscoder/EssenceStream/InputAudio.cpp b/src/AvTranscoder/EssenceStream/InputAudio.cpp index 6c8fe96c..65753c0d 100644 --- a/src/AvTranscoder/EssenceStream/InputAudio.cpp +++ b/src/AvTranscoder/EssenceStream/InputAudio.cpp @@ -72,12 +72,6 @@ void InputAudio::setup() _codecContext->channels = _inputStream->getAudioDesc().getChannels(); - // std::cout << "Audio codec Id : " << _codecContext->codec_id << std::endl; - // std::cout << "Audio codec Id : " << _codec->name << std::endl; - // std::cout << "Audio codec Id : " << _codec->long_name << std::endl; - - _codecContext->channels = _inputStream->getAudioDesc().getCodecContext()->channels; - int ret = avcodec_open2( _codecContext, _codec, NULL ); if( ret < 0 || _codecContext == NULL || _codec == NULL ) From 856985ca33821c31c5a598de04be2edff32eb854 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Aug 2014 16:14:25 +0200 Subject: [PATCH 5/5] CodedDesc: reorder includes --- src/AvTranscoder/CodedStructures/CodedDesc.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AvTranscoder/CodedStructures/CodedDesc.hpp b/src/AvTranscoder/CodedStructures/CodedDesc.hpp index dd29db94..d0d2f951 100644 --- a/src/AvTranscoder/CodedStructures/CodedDesc.hpp +++ b/src/AvTranscoder/CodedStructures/CodedDesc.hpp @@ -1,10 +1,10 @@ #ifndef _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_ #define _AV_TRANSCODER_CODED_STRUCTURES_ESSENCE_DESC_HPP_ -#include - #include +#include + class AVCodec; class AVCodecContext;