Transcoder: refactoring - addDummyStream with const EssenceDesc

Clement Champetier · Clement Champetier · commit 6690e592e3fd · 2014-07-21T15:31:44.000+02:00
* Use "const EssenceDesc" instead of "EssenceDesc" when add a
DummyStream.
* Consequences:
     * AudioDesc: copy constructor with const EssenceDesc.
     * VideoDesc: copy constructor with const EssenceDesc.
     * DummyVideo: setVideoDesc from a const VideoDesc (already the case
for setAudioDesc in DummyAudio).
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.cpp b/src/AvTranscoder/DatasStructures/AudioDesc.cpp
@@ -15,7 +15,7 @@ AudioDesc::AudioDesc( const AVCodecID codecId )
 {
 }
 
-AudioDesc::AudioDesc( EssenceDesc& essenceDesc )
+AudioDesc::AudioDesc( const EssenceDesc& essenceDesc )
 	: EssenceDesc( essenceDesc.getCodecId() )
 {
 	m_codec = essenceDesc.getCodec();
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.hpp b/src/AvTranscoder/DatasStructures/AudioDesc.hpp
@@ -26,7 +26,7 @@ class AvExport AudioDesc : public EssenceDesc
 public:
 	AudioDesc( const std::string& codecName = "" );
 	AudioDesc( const AVCodecID codecId );
-	AudioDesc( EssenceDesc& essenceDesc );
+	AudioDesc( const EssenceDesc& essenceDesc );
 
 	AudioFrameDesc getFrameDesc() const;
 	const size_t getSampleRate() const;
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -15,7 +15,7 @@ VideoDesc::VideoDesc( const AVCodecID codecId )
 {
 }
 
-VideoDesc::VideoDesc( EssenceDesc& essenceDesc )
+VideoDesc::VideoDesc( const EssenceDesc& essenceDesc )
 	: EssenceDesc( essenceDesc.getCodecId() )
 {
 	m_codec = essenceDesc.getCodec();
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/DatasStructures/VideoDesc.hpp
@@ -26,7 +26,7 @@ class AvExport VideoDesc : public EssenceDesc
 public:
 	VideoDesc( const std::string& codecName = "" );
 	VideoDesc( const AVCodecID codecId );
-	VideoDesc( EssenceDesc& essenceDesc );
+	VideoDesc( const EssenceDesc& essenceDesc );
 	
 	ImageDesc getImageDesc() const;
 	std::pair< size_t, size_t > getTimeBase() const;
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.cpp b/src/AvTranscoder/EssenceStream/DummyVideo.cpp
@@ -17,7 +17,7 @@ DummyVideo::~DummyVideo( )
 {
 }
 
-void DummyVideo::setVideoDesc( VideoDesc& videoDesc )
+void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )
 {
 	_videoDesc = videoDesc;
 	_imageDesc = _videoDesc.getImageDesc();
diff --git a/src/AvTranscoder/EssenceStream/DummyVideo.hpp b/src/AvTranscoder/EssenceStream/DummyVideo.hpp
@@ -17,7 +17,7 @@ class AvExport DummyVideo : public InputEssence
 	~DummyVideo( );
 
 	// Stream properties
-	void setVideoDesc( VideoDesc& videoDesc );
+	void setVideoDesc( const VideoDesc& videoDesc );
 
 	VideoDesc getVideoDesc() const;
 	
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -291,7 +291,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	}
 }
 
-void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, EssenceDesc& essenceDesc )
+void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc )
 {
 	if( ! profile.count( Profile::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -79,7 +79,7 @@ class Transcoder
 
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile );
 
-	void addDummyStream( const Profile::ProfileDesc& profile, EssenceDesc& essenceDesc );
+	void addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc );
 
 	InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ AudioDesc::AudioDesc( const AVCodecID codecId )`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`-AudioDesc::AudioDesc( EssenceDesc& essenceDesc )`
	`18`	`+AudioDesc::AudioDesc( const EssenceDesc& essenceDesc )`
`19`	`19`	`: EssenceDesc( essenceDesc.getCodecId() )`
`20`	`20`	`{`
`21`	`21`	`m_codec = essenceDesc.getCodec();`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ VideoDesc::VideoDesc( const AVCodecID codecId )`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`-VideoDesc::VideoDesc( EssenceDesc& essenceDesc )`
	`18`	`+VideoDesc::VideoDesc( const EssenceDesc& essenceDesc )`
`19`	`19`	`: EssenceDesc( essenceDesc.getCodecId() )`
`20`	`20`	`{`
`21`	`21`	`m_codec = essenceDesc.getCodec();`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ DummyVideo::~DummyVideo( )`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
`20`		`-void DummyVideo::setVideoDesc( VideoDesc& videoDesc )`
	`20`	`+void DummyVideo::setVideoDesc( const VideoDesc& videoDesc )`
`21`	`21`	`{`
`22`	`22`	`_videoDesc = videoDesc;`
`23`	`23`	`_imageDesc = _videoDesc.getImageDesc();`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, EssenceDesc& essenceDesc )`
	`294`	`+void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const EssenceDesc& essenceDesc )`
`295`	`295`	`{`
`296`	`296`	`if( ! profile.count( Profile::avProfileType ) )`
`297`	`297`	`throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );`