adding asserts

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e517acdff410 · 2014-07-03T08:29:03.000-04:00
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.cpp b/src/AvTranscoder/DatasStructures/AudioDesc.cpp
@@ -17,6 +17,7 @@ extern "C" {
 #include <iostream>
 #include <stdexcept>
 #include <sstream>
+#include <cassert>
 
 namespace avtranscoder
 {
@@ -36,6 +37,13 @@ AudioDesc::AudioDesc( const AVCodecID codecId )
 	setAudioCodec( codecId );
 }
 
+AudioDesc::AudioDesc( const AudioDesc& audioDesc )
+	: m_codec( NULL )
+	, m_codecContext( NULL ) 
+{
+	setAudioCodec( audioDesc.getAudioCodecId() );
+}
+
 void AudioDesc::setAudioCodec( const std::string& codecName )
 {
 	avcodec_register_all();  // Warning: should be called only once
@@ -186,32 +194,38 @@ void AudioDesc::set( const std::string& key, const std::string& value )
 
 std::string AudioDesc::getAudioCodec() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->codec_name;
 }
 
 AVCodecID AudioDesc::getAudioCodecId() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->codec_id;
 }
 
 
 const size_t AudioDesc::getSampleRate() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->sample_rate;
 }
 
 const size_t AudioDesc::getChannels() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->channels;
 }
 
 const AVSampleFormat AudioDesc::getSampleFormat() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->sample_fmt;
 }
 
 AudioFrameDesc AudioDesc::getFrameDesc() const
 {
+	assert( m_codecContext != NULL );
 	AudioFrameDesc audioFrameDesc;
 	
 	audioFrameDesc.setChannels( m_codecContext->channels );
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.hpp b/src/AvTranscoder/DatasStructures/AudioDesc.hpp
@@ -25,6 +25,8 @@ class AvExport AudioDesc
 public:
 	AudioDesc( const std::string& codecName = "" );
 	AudioDesc( const AVCodecID codecId );
+	
+	AudioDesc( const AudioDesc& audioDesc );
 
 	void setAudioCodec( const std::string& codecName );
 	void setAudioCodec( const AVCodecID codecId );
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -16,6 +16,7 @@ extern "C" {
 #include <iostream>
 #include <stdexcept>
 #include <sstream>
+#include <cassert>
 
 namespace avtranscoder
 {
@@ -76,16 +77,19 @@ void VideoDesc::setTimeBase( const size_t num, const size_t den, const size_t ti
 
 std::string VideoDesc::getVideoCodec() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->codec_name;
 }
 
 AVCodecID VideoDesc::getVideoCodecId() const
 {
+	assert( m_codecContext != NULL );
 	return m_codecContext->codec_id;
 }
 
 std::pair< size_t, size_t > VideoDesc::getTimeBase() const
 {
+	assert( m_codecContext != NULL );
 	std::pair< size_t, size_t > timeBase;
 	timeBase.first = m_codecContext->time_base.num;
 	timeBase.second = m_codecContext->time_base.den;
@@ -221,6 +225,7 @@ void VideoDesc::set( const std::string& key, const std::string& value )
 
 ImageDesc VideoDesc::getImageDesc() const
 {
+	assert( m_codecContext != NULL );
 	ImageDesc imageDesc;
 	Pixel pixel( m_codecContext->pix_fmt );
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ extern "C" {`
`17`	`17`	`#include <iostream>`
`18`	`18`	`#include <stdexcept>`
`19`	`19`	`#include <sstream>`
	`20`	`+#include <cassert>`
`20`	`21`
`21`	`22`	`namespace avtranscoder`
`22`	`23`	`{`
`@@ -36,6 +37,13 @@ AudioDesc::AudioDesc( const AVCodecID codecId )`
`36`	`37`	`setAudioCodec( codecId );`
`37`	`38`	`}`
`38`	`39`
	`40`	`+AudioDesc::AudioDesc( const AudioDesc& audioDesc )`
	`41`	`+ : m_codec( NULL )`
	`42`	`+ , m_codecContext( NULL )`
	`43`	`+{`
	`44`	`+ setAudioCodec( audioDesc.getAudioCodecId() );`
	`45`	`+}`
	`46`	`+`
`39`	`47`	`void AudioDesc::setAudioCodec( const std::string& codecName )`
`40`	`48`	`{`
`41`	`49`	`avcodec_register_all(); // Warning: should be called only once`
`@@ -186,32 +194,38 @@ void AudioDesc::set( const std::string& key, const std::string& value )`
`186`	`194`
`187`	`195`	`std::string AudioDesc::getAudioCodec() const`
`188`	`196`	`{`
	`197`	`+ assert( m_codecContext != NULL );`
`189`	`198`	`return m_codecContext->codec_name;`
`190`	`199`	`}`
`191`	`200`
`192`	`201`	`AVCodecID AudioDesc::getAudioCodecId() const`
`193`	`202`	`{`
	`203`	`+ assert( m_codecContext != NULL );`
`194`	`204`	`return m_codecContext->codec_id;`
`195`	`205`	`}`
`196`	`206`
`197`	`207`
`198`	`208`	`const size_t AudioDesc::getSampleRate() const`
`199`	`209`	`{`
	`210`	`+ assert( m_codecContext != NULL );`
`200`	`211`	`return m_codecContext->sample_rate;`
`201`	`212`	`}`
`202`	`213`
`203`	`214`	`const size_t AudioDesc::getChannels() const`
`204`	`215`	`{`
	`216`	`+ assert( m_codecContext != NULL );`
`205`	`217`	`return m_codecContext->channels;`
`206`	`218`	`}`
`207`	`219`
`208`	`220`	`const AVSampleFormat AudioDesc::getSampleFormat() const`
`209`	`221`	`{`
	`222`	`+ assert( m_codecContext != NULL );`
`210`	`223`	`return m_codecContext->sample_fmt;`
`211`	`224`	`}`
`212`	`225`
`213`	`226`	`AudioFrameDesc AudioDesc::getFrameDesc() const`
`214`	`227`	`{`
	`228`	`+ assert( m_codecContext != NULL );`
`215`	`229`	`AudioFrameDesc audioFrameDesc;`
`216`	`230`
`217`	`231`	`audioFrameDesc.setChannels( m_codecContext->channels );`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ extern "C" {`
`16`	`16`	`#include <iostream>`
`17`	`17`	`#include <stdexcept>`
`18`	`18`	`#include <sstream>`
	`19`	`+#include <cassert>`
`19`	`20`
`20`	`21`	`namespace avtranscoder`
`21`	`22`	`{`
`@@ -76,16 +77,19 @@ void VideoDesc::setTimeBase( const size_t num, const size_t den, const size_t ti`
`76`	`77`
`77`	`78`	`std::string VideoDesc::getVideoCodec() const`
`78`	`79`	`{`
	`80`	`+ assert( m_codecContext != NULL );`
`79`	`81`	`return m_codecContext->codec_name;`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`AVCodecID VideoDesc::getVideoCodecId() const`
`83`	`85`	`{`
	`86`	`+ assert( m_codecContext != NULL );`
`84`	`87`	`return m_codecContext->codec_id;`
`85`	`88`	`}`
`86`	`89`
`87`	`90`	`std::pair< size_t, size_t > VideoDesc::getTimeBase() const`
`88`	`91`	`{`
	`92`	`+ assert( m_codecContext != NULL );`
`89`	`93`	`std::pair< size_t, size_t > timeBase;`
`90`	`94`	`timeBase.first = m_codecContext->time_base.num;`
`91`	`95`	`timeBase.second = m_codecContext->time_base.den;`
`@@ -221,6 +225,7 @@ void VideoDesc::set( const std::string& key, const std::string& value )`
`221`	`225`
`222`	`226`	`ImageDesc VideoDesc::getImageDesc() const`
`223`	`227`	`{`
	`228`	`+ assert( m_codecContext != NULL );`
`224`	`229`	`ImageDesc imageDesc;`
`225`	`230`	`Pixel pixel( m_codecContext->pix_fmt );`
`226`	`231`