Merge pull request #496 from cchampet/fix_AudioVideoFixNegativeOffset

cchampet · cchampet · commit 88985d06a990 · 2015-11-06T15:55:25.000+01:00
AudioVideo: up to v4.5
* Fix audio negative offset.
* get bitDepth of input from avtranscoder.
diff --git a/plugins/image/io/AudioVideo/avTranscoder b/plugins/image/io/AudioVideo/avTranscoder
@@ -1 +1 @@
-Subproject commit e6532287481a169f4342581504d1eb9457ecc67d
+Subproject commit 19d9b3c5b24c351e0394a2921110ac0c19f6ed1f
diff --git a/plugins/image/io/AudioVideo/src/mainEntry.cpp b/plugins/image/io/AudioVideo/src/mainEntry.cpp
@@ -1,5 +1,5 @@
 #define OFXPLUGIN_VERSION_MAJOR 4
-#define OFXPLUGIN_VERSION_MINOR 4
+#define OFXPLUGIN_VERSION_MINOR 5
 
 #include <tuttle/plugin/Plugin.hpp>
 #include "reader/AVReaderPluginFactory.hpp"
diff --git a/plugins/image/io/AudioVideo/src/reader/AVReaderProcess.tcc b/plugins/image/io/AudioVideo/src/reader/AVReaderProcess.tcc
@@ -53,8 +53,8 @@ void AVReaderProcess<View>::multiThreadProcessImages( const OfxRectI& procWindow
 	BOOST_ASSERT( procWindowRoW == this->_dstPixelRod );
 
 	avtranscoder::PixelProperties pixel( _plugin._inputFile->getProperties().getVideoProperties().at( _plugin._paramVideoStreamIndex->getValue() ).getPixelProperties() );
-	size_t components = pixel.getNbComponents();
-	size_t bitDepth = 8; // @todo: waiting for getMaxBitPerChannel() in avTranscoder
+	const size_t components = pixel.getNbComponents();
+	const size_t bitDepth = pixel.getMaxNbBitsInChannels();
 	
 	switch( bitDepth )
 	{

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ void AVReaderProcess<View>::multiThreadProcessImages( const OfxRectI& procWindow`
`53`	`53`	`BOOST_ASSERT( procWindowRoW == this->_dstPixelRod );`
`54`	`54`
`55`	`55`	`avtranscoder::PixelProperties pixel( _plugin._inputFile->getProperties().getVideoProperties().at( _plugin._paramVideoStreamIndex->getValue() ).getPixelProperties() );`
`56`		`- size_t components = pixel.getNbComponents();`
`57`		`- size_t bitDepth = 8; // @todo: waiting for getMaxBitPerChannel() in avTranscoder`
	`56`	`+ const size_t components = pixel.getNbComponents();`
	`57`	`+ const size_t bitDepth = pixel.getMaxNbBitsInChannels();`
`58`	`58`
`59`	`59`	`switch( bitDepth )`
`60`	`60`	`{`