Merge pull request #328 from avTranscoder/fix/get_min_max_bit_rates_from_side_data

valnoel · web-flow · commit 105a32b0e158 · 2022-06-14T16:06:43.000+02:00
VideoProperties: extract min and max bitrate from side data
diff --git a/src/AvTranscoder/properties/StreamProperties.cpp b/src/AvTranscoder/properties/StreamProperties.cpp
@@ -28,10 +28,13 @@ StreamProperties::StreamProperties(const FileProperties& fileProperties, const s
             throw std::runtime_error(ss.str());
         }
 
-        _codec = avcodec_find_decoder(_formatContext->streams[_streamIndex]->codecpar->codec_id);
+        AVStream* stream = _formatContext->streams[_streamIndex];
+        _codec = avcodec_find_decoder(stream->codecpar->codec_id);
         _codecContext = avcodec_alloc_context3(_codec);
 
-        avcodec_parameters_to_context(_codecContext, _formatContext->streams[_streamIndex]->codecpar);
+        avcodec_parameters_to_context(_codecContext, stream->codecpar);
+        _codecContext->time_base = stream->time_base;
+        _codecContext->coded_side_data = stream->side_data;
     }
 
     // find the decoder
diff --git a/src/AvTranscoder/properties/VideoProperties.cpp b/src/AvTranscoder/properties/VideoProperties.cpp
@@ -371,13 +371,29 @@ size_t VideoProperties::getMaxBitRate() const
 {
     if(!_codecContext)
         throw std::runtime_error("unknown codec context");
+
+    if (_codecContext->rc_max_rate == 0
+        && _codecContext->coded_side_data
+        && _codecContext->coded_side_data->type == AV_PKT_DATA_CPB_PROPERTIES) {
+        const AVCPBProperties* prop = (AVCPBProperties*) _codecContext->coded_side_data->data;
+        return prop->max_bitrate;
+    }
+
     return _codecContext->rc_max_rate;
 }
 
 size_t VideoProperties::getMinBitRate() const
 {
     if(!_codecContext)
         throw std::runtime_error("unknown codec context");
+
+    if (_codecContext->rc_max_rate == 0
+        && _codecContext->coded_side_data
+        && _codecContext->coded_side_data->type == AV_PKT_DATA_CPB_PROPERTIES) {
+        const AVCPBProperties* prop = (AVCPBProperties*) _codecContext->coded_side_data->data;
+        return prop->min_bitrate;
+    }
+
     return _codecContext->rc_min_rate;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,13 @@ StreamProperties::StreamProperties(const FileProperties& fileProperties, const s`
`28`	`28`	`throw std::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`