Commit 314b421d authored by Mark Thompson's avatar Mark Thompson

vaapi_encode: Decide on GOP setup before initialising sequence parameters

This was always too late; several fields related to it have been incorrectly
zero since the encoder was added.
parent 5cc0057f
...@@ -1363,6 +1363,12 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ...@@ -1363,6 +1363,12 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
ctx->decode_delay = 1; ctx->decode_delay = 1;
ctx->output_order = - ctx->output_delay - 1; ctx->output_order = - ctx->output_delay - 1;
// Currently we never generate I frames, only IDR.
ctx->i_per_idr = 0;
ctx->p_per_i = ((avctx->gop_size + avctx->max_b_frames) /
(avctx->max_b_frames + 1));
ctx->b_per_p = avctx->max_b_frames;
if (ctx->codec->sequence_params_size > 0) { if (ctx->codec->sequence_params_size > 0) {
ctx->codec_sequence_params = ctx->codec_sequence_params =
av_mallocz(ctx->codec->sequence_params_size); av_mallocz(ctx->codec->sequence_params_size);
...@@ -1389,12 +1395,6 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ...@@ -1389,12 +1395,6 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
} }
} }
// All I are IDR for now.
ctx->i_per_idr = 0;
ctx->p_per_i = ((avctx->gop_size + avctx->max_b_frames) /
(avctx->max_b_frames + 1));
ctx->b_per_p = avctx->max_b_frames;
// This should be configurable somehow. (Needs testing on a machine // This should be configurable somehow. (Needs testing on a machine
// where it actually overlaps properly, though.) // where it actually overlaps properly, though.)
ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT; ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment