Commit11c7173

authored

Merge pull request#290 from cchampet/fix_VideoPropertiesGetFpsWithoutAverageFramerate

VideoProperties: fix getFps if the average framerate is not defined

2 parents985a661 +f7ef5be commit11c7173Copy full SHA for 11c7173

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,12 @@ int VideoProperties::getLevel() const`
`432`	`432`
`433`	`433`	`floatVideoProperties::getFps()const`
`434`	`434`	`{`
`435`		`-returnav_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);`
	`435`	`+if(! _formatContext)`
	`436`	`+throwstd::runtime_error("unknown format context");`
	`437`	`+`
	`438`	`+if(_formatContext->streams[_streamIndex]->avg_frame_rate.den)`
	`439`	`+returnav_q2d(_formatContext->streams[_streamIndex]->avg_frame_rate);`
	`440`	`+returnav_q2d(av_inv_q(getTimeBase()));`
`436`	`441`	`}`
`437`	`442`
`438`	`443`	`floatVideoProperties::getDuration()const`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ class AvExport VideoProperties : public StreamProperties`
`64`	`64`
`65`	`65`	`/**`
`66`	`66`	`* @brief Corresponds to the 'fps' returned by ffprobe.`
	`67`	`+ * @note If the average framerate is not defined in the format, return the tbn.`
`67`	`68`	`* fps = the average framerate that has come from the AVStream`
`68`	`69`	`* tbn = the time base in AVStream that has come from the AVStream`
`69`	`70`	`* tbc = the time base in AVCodecContext for the codec used for a particular stream`

Comments

(0)