Merge pull request #59 from cchampet/clean_encoders_decoders

valnoel · valnoel · commit 4e4fe60ce859 · 2015-01-19T17:41:43.000+01:00
Clean encoders / decoders
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -42,7 +42,6 @@ VideoDecoder::~VideoDecoder()
 
 void VideoDecoder::setup()
 {
-	
 	_inputStream->getVideoCodec().open();
 
 #if LIBAVCODEC_VERSION_MAJOR > 54
@@ -134,7 +133,7 @@ void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "[InputVideo] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+			std::cout << "[VideoDecoder] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -187,7 +187,7 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "[OutputAudio] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+			std::cout << "[AudioEncoder] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -176,7 +176,7 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr
 		}
 		catch( std::exception& e )
 		{
-			std::cout << "[OutputVideo] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
+			std::cout << "[VideoEncoder] warning - can't set option " << (*it).first << " to " << (*it).second << ": " << e.what() << std::endl;
 		}
 	}
 }
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -17,12 +17,18 @@ namespace avtranscoder
 class AvExport AudioFrameDesc
 {
 public:
+	/**
+	 * @warning FPS value is set to 25 by default
+	 */
 	AudioFrameDesc( const size_t sampleRate = 0, const size_t channels = 0, const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
 		, _sampleFormat( sampleFormat )
 		, _fps( 25. )
 	{}
+	/**
+	 * @warning FPS value is set to 25 by default
+	 */
 	AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -89,7 +89,7 @@ VideoCodec& InputStream::getVideoCodec()
 		throw std::runtime_error( "unable to get video descriptor on non-video stream" );
 	}
 
-	return *static_cast<VideoCodec*>( _codec );;
+	return *static_cast<VideoCodec*>( _codec );
 }
 
 AudioCodec& InputStream::getAudioCodec()
@@ -101,7 +101,7 @@ AudioCodec& InputStream::getAudioCodec()
 		throw std::runtime_error( "unable to get audio descriptor on non-audio stream" );
 	}
 
-	return *static_cast<AudioCodec*>( _codec );;
+	return *static_cast<AudioCodec*>( _codec );
 }
 
 DataCodec& InputStream::getDataCodec()
@@ -113,7 +113,7 @@ DataCodec& InputStream::getDataCodec()
 		throw std::runtime_error( "unable to get data descriptor on non-data stream" );
 	}
 
-	return *static_cast<DataCodec*>( _codec );;
+	return *static_cast<DataCodec*>( _codec );
 }
 
 AVMediaType InputStream::getStreamType() const

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ VideoDecoder::~VideoDecoder()`
`42`	`42`
`43`	`43`	`void VideoDecoder::setup()`
`44`	`44`	`{`
`45`		`-`
`46`	`45`	`_inputStream->getVideoCodec().open();`
`47`	`46`
`48`	`47`	`#if LIBAVCODEC_VERSION_MAJOR > 54`
`@@ -134,7 +133,7 @@ void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )`
`134`	`133`	`}`
`135`	`134`	`catch( std::exception& e )`
`136`	`135`	`{`
`137`		`- std::cout << "[InputVideo] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
	`136`	`+ std::cout << "[VideoDecoder] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const Audi`
`187`	`187`	`}`
`188`	`188`	`catch( std::exception& e )`
`189`	`189`	`{`
`190`		`- std::cout << "[OutputAudio] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
	`190`	`+ std::cout << "[AudioEncoder] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtr`
`176`	`176`	`}`
`177`	`177`	`catch( std::exception& e )`
`178`	`178`	`{`
`179`		`- std::cout << "[OutputVideo] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
	`179`	`+ std::cout << "[VideoEncoder] warning - can't set option " << (it).first << " to " << (it).second << ": " << e.what() << std::endl;`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ VideoCodec& InputStream::getVideoCodec()`
`89`	`89`	`throw std::runtime_error( "unable to get video descriptor on non-video stream" );`
`90`	`90`	`}`
`91`	`91`
`92`		`- return static_cast<VideoCodec>( _codec );;`
	`92`	`+ return static_cast<VideoCodec>( _codec );`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`AudioCodec& InputStream::getAudioCodec()`
`@@ -101,7 +101,7 @@ AudioCodec& InputStream::getAudioCodec()`
`101`	`101`	`throw std::runtime_error( "unable to get audio descriptor on non-audio stream" );`
`102`	`102`	`}`
`103`	`103`
`104`		`- return static_cast<AudioCodec>( _codec );;`
	`104`	`+ return static_cast<AudioCodec>( _codec );`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`DataCodec& InputStream::getDataCodec()`
`@@ -113,7 +113,7 @@ DataCodec& InputStream::getDataCodec()`
`113`	`113`	`throw std::runtime_error( "unable to get data descriptor on non-data stream" );`
`114`	`114`	`}`
`115`	`115`
`116`		`- return static_cast<DataCodec>( _codec );;`
	`116`	`+ return static_cast<DataCodec>( _codec );`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`AVMediaType InputStream::getStreamType() const`