Set ticks_per_frames in setTimeBase methods (into VideoDesc)

Valentin Noel · Valentin Noel · commit ee9da1161d9b · 2014-06-20T19:05:19.000+02:00
diff --git a/src/AvTranscoder/AvInputStream.cpp b/src/AvTranscoder/AvInputStream.cpp
@@ -103,7 +103,7 @@ VideoDesc AvInputStream::getVideoDesc() const
 	VideoDesc desc( codecContext->codec_id );
 
 	desc.setImageParameters( codecContext->width, codecContext->height, codecContext->pix_fmt );
-	desc.setTimeBase( codecContext->time_base.num, codecContext->time_base.den );
+	desc.setTimeBase( codecContext->time_base.num, codecContext->time_base.den, codecContext->ticks_per_frame );
 
 	return desc;
 }
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -67,10 +67,11 @@ void VideoDesc::setImageParameters( const size_t width, const size_t height, con
 	m_codecContext->pix_fmt = pixel;
 }
 
-void VideoDesc::setTimeBase( const size_t num, const size_t den )
+void VideoDesc::setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame )
 {
 	m_codecContext->time_base.num = num;
 	m_codecContext->time_base.den = den;
+	m_codecContext->ticks_per_frame = ticksPerFrame;
 }
 
 std::string VideoDesc::getVideoCodec() const
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/DatasStructures/VideoDesc.hpp
@@ -34,7 +34,7 @@ class AvExport VideoDesc
 	void setImageParameters( const size_t width, const size_t height, const Pixel& pixel );
 	void setImageParameters( const size_t width, const size_t height, const AVPixelFormat& pixel );
 
-	void setTimeBase( const size_t num, const size_t den );
+	void setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame = 1 );
 	
 	void set( const std::string& key, const std::string& flag, const bool enable );
 	void set( const std::string& key, const bool value );

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ VideoDesc AvInputStream::getVideoDesc() const`
`103`	`103`	`VideoDesc desc( codecContext->codec_id );`
`104`	`104`
`105`	`105`	`desc.setImageParameters( codecContext->width, codecContext->height, codecContext->pix_fmt );`
`106`		`- desc.setTimeBase( codecContext->time_base.num, codecContext->time_base.den );`
	`106`	`+ desc.setTimeBase( codecContext->time_base.num, codecContext->time_base.den, codecContext->ticks_per_frame );`
`107`	`107`
`108`	`108`	`return desc;`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,11 @@ void VideoDesc::setImageParameters( const size_t width, const size_t height, con`
`67`	`67`	`m_codecContext->pix_fmt = pixel;`
`68`	`68`	`}`
`69`	`69`
`70`		`-void VideoDesc::setTimeBase( const size_t num, const size_t den )`
	`70`	`+void VideoDesc::setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame )`
`71`	`71`	`{`
`72`	`72`	`m_codecContext->time_base.num = num;`
`73`	`73`	`m_codecContext->time_base.den = den;`
	`74`	`+ m_codecContext->ticks_per_frame = ticksPerFrame;`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`std::string VideoDesc::getVideoCodec() const`