Commit105a32b

authored

Merge pull request#328 from avTranscoder/fix/get_min_max_bit_rates_from_side_data

VideoProperties: extract min and max bitrate from side data

2 parents69e9bda +e6b0d05 commit105a32bCopy full SHA for 105a32b

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,13 @@ StreamProperties::StreamProperties(const FileProperties& fileProperties, const s`
`28`	`28`	`throwstd::runtime_error(ss.str());`
`29`	`29`	`}`
`30`	`30`
`31`		`- _codec =avcodec_find_decoder(_formatContext->streams[_streamIndex]->codecpar->codec_id);`
	`31`	`+ AVStream* stream = _formatContext->streams[_streamIndex];`
	`32`	`+ _codec =avcodec_find_decoder(stream->codecpar->codec_id);`
`32`	`33`	`_codecContext =avcodec_alloc_context3(_codec);`
`33`	`34`
`34`		`-avcodec_parameters_to_context(_codecContext, _formatContext->streams[_streamIndex]->codecpar);`
	`35`	`+avcodec_parameters_to_context(_codecContext, stream->codecpar);`
	`36`	`+ _codecContext->time_base = stream->time_base;`
	`37`	`+ _codecContext->coded_side_data = stream->side_data;`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`// find the decoder`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -371,13 +371,29 @@ size_t VideoProperties::getMaxBitRate() const`
`371`	`371`	`{`
`372`	`372`	`if(!_codecContext)`
`373`	`373`	`throwstd::runtime_error("unknown codec context");`
	`374`	`+`
	`375`	`+if (_codecContext->rc_max_rate ==0`
	`376`	`+ && _codecContext->coded_side_data`
	`377`	`+ && _codecContext->coded_side_data->type == AV_PKT_DATA_CPB_PROPERTIES) {`
	`378`	`+const AVCPBProperties* prop = (AVCPBProperties*) _codecContext->coded_side_data->data;`
	`379`	`+return prop->max_bitrate;`
	`380`	`+ }`
	`381`	`+`
`374`	`382`	`return _codecContext->rc_max_rate;`
`375`	`383`	`}`
`376`	`384`
`377`	`385`	`size_tVideoProperties::getMinBitRate()const`
`378`	`386`	`{`
`379`	`387`	`if(!_codecContext)`
`380`	`388`	`throwstd::runtime_error("unknown codec context");`
	`389`	`+`
	`390`	`+if (_codecContext->rc_max_rate ==0`
	`391`	`+ && _codecContext->coded_side_data`
	`392`	`+ && _codecContext->coded_side_data->type == AV_PKT_DATA_CPB_PROPERTIES) {`
	`393`	`+const AVCPBProperties* prop = (AVCPBProperties*) _codecContext->coded_side_data->data;`
	`394`	`+return prop->min_bitrate;`
	`395`	`+ }`
	`396`	`+`
`381`	`397`	`return _codecContext->rc_min_rate;`
`382`	`398`	`}`
`383`	`399`

Comments

(0)