Merge pull request #380 from cchampet/dev_AudioVideoUpToAvTranscoder0.5.3

AudioVideo: up avtranscoder to v0.5.3

Author: cchampet

plugins/image/io/AudioVideo/CMakeLists.txt

@@ -13,6 +13,8 @@ if(FFMPEG_FOUND)
         tuttle_install_shared_libs("${${var}}") 
     endforeach()
     # Build avTranscoder library
+    set(AVTRANSCODER_DISABLE_APPS True)
+    set(AVTRANSCODER_DISABLE_BINDINGS True)
     add_subdirectory(avTranscoder)
 endif(FFMPEG_FOUND)
 

plugins/image/io/AudioVideo/avTranscoder

@@ -3,7 +3,7 @@
 
 #include <AvTranscoder/util.hpp>
 #include <AvTranscoder/Option.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 
 #include <ofxsImageEffect.h>
 

plugins/image/io/AudioVideo/src/common/util.hpp

@@ -491,9 +491,9 @@ void AVReaderPlugin::beginSequenceRender( const OFX::BeginSequenceRenderArgument
 
 	// manage verbose level
 	if( _paramVerbose->getValue() )
-		avtranscoder::setLogLevel( AV_LOG_DEBUG );
+		avtranscoder::Logger::setLogLevel( AV_LOG_DEBUG );
 	else
-		avtranscoder::setLogLevel( AV_LOG_QUIET );
+		avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 }
 
 void AVReaderPlugin::render( const OFX::RenderArguments& args )

plugins/image/io/AudioVideo/src/reader/AVReaderPlugin.cpp

@@ -30,7 +30,7 @@ namespace reader {
 void AVReaderPluginFactory::describe( OFX::ImageEffectDescriptor& desc )
 {
 	avtranscoder::preloadCodecsAndFormats();
-	avtranscoder::setLogLevel( AV_LOG_QUIET );
+	avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 
 	desc.setLabels(
 		"TuttleAVReader",

plugins/image/io/AudioVideo/src/reader/AVReaderPluginFactory.cpp

@@ -1049,9 +1049,9 @@ void AVWriterPlugin::beginSequenceRender( const OFX::BeginSequenceRenderArgument
 
 	// manage verbose level
 	if( _paramVerbose->getValue() )
-		avtranscoder::setLogLevel( AV_LOG_DEBUG );
+		avtranscoder::Logger::setLogLevel( AV_LOG_DEBUG );
 	else
-		avtranscoder::setLogLevel( AV_LOG_QUIET );
+		avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 }
 
 /**

plugins/image/io/AudioVideo/src/writer/AVWriterPlugin.cpp

@@ -5,8 +5,8 @@
 
 #include <tuttle/plugin/context/WriterPlugin.hpp>
 
-#include <AvTranscoder/ProfileLoader.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
 #include <AvTranscoder/frame/Frame.hpp>
 

plugins/image/io/AudioVideo/src/writer/AVWriterPlugin.hpp

@@ -9,7 +9,7 @@
 #include <AvTranscoder/common.hpp>
 #include <AvTranscoder/util.hpp>
 #include <AvTranscoder/Library.hpp>
-#include <AvTranscoder/ProfileLoader.hpp>
+#include <AvTranscoder/profile/ProfileLoader.hpp>
 #include <AvTranscoder/file/FormatContext.hpp>
 
 #include <boost/algorithm/string/join.hpp>
@@ -33,7 +33,7 @@ namespace writer {
 void AVWriterPluginFactory::describe( OFX::ImageEffectDescriptor& desc )
 {
 	avtranscoder::preloadCodecsAndFormats();
-	avtranscoder::setLogLevel( AV_LOG_QUIET );
+	avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
 
 	desc.setLabels(
 		"TuttleAVWriter",

plugins/image/io/AudioVideo/src/writer/AVWriterPluginFactory.cpp

@@ -38,10 +38,7 @@ void AVWriterProcess<View>::multiThreadProcessImages( const OfxRectI& procWindow
 
 	rgb8_image_t img ( this->_srcView.dimensions() );
 	rgb8_view_t  vw  ( view( img ) );
-	
-	// Convert pixels to destination
-	copy_and_convert_pixels( this->_srcView, this->_dstView );
-	
+
 	// Convert pixels in PIX_FMT_RGB24
 	copy_and_convert_pixels( this->_srcView, vw );