highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/libx265: signal CPB properties through side data

Browse Source 
This way values such as maxrate/bufsize can be utilized
further down the chain.
This commit is contained in:
Jan Ekström 2019-02-23 02:35:28 +02:00
parent 17008a0107
commit 4635f64953
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libx265.c
View File

@ -79,6 +79,7 @@ static av_cold int libx265_encode_close(AVCodecContext *avctx)
static av_cold int libx265_encode_init(AVCodecContext *avctx) static av_cold int libx265_encode_init(AVCodecContext *avctx)
{ {
libx265Context *ctx = avctx->priv_data; libx265Context *ctx = avctx->priv_data;
AVCPBProperties *cpb_props = NULL;
ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth); ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth);
if (!ctx->api) if (!ctx->api)
@ -208,6 +209,13 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
ctx->params->rc.vbvBufferSize = avctx->rc_buffer_size / 1000; ctx->params->rc.vbvBufferSize = avctx->rc_buffer_size / 1000;
ctx->params->rc.vbvMaxBitrate = avctx->rc_max_rate / 1000; ctx->params->rc.vbvMaxBitrate = avctx->rc_max_rate / 1000;
cpb_props = ff_add_cpb_side_data(avctx);
if (!cpb_props)
return AVERROR(ENOMEM);
cpb_props->buffer_size = ctx->params->rc.vbvBufferSize * 1000;
cpb_props->max_bitrate = ctx->params->rc.vbvMaxBitrate * 1000;
cpb_props->avg_bitrate = ctx->params->rc.bitrate * 1000;
if (!(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) if (!(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER))
ctx->params->bRepeatHeaders = 1; ctx->params->bRepeatHeaders = 1;