diff options
author | Mark Thompson <sw@jkqxz.net> | 2016-09-30 17:27:58 +0200 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2016-10-02 20:23:18 +0100 |
commit | 314b421dd8910ebed7a8d419a0dbea239a00044e (patch) | |
tree | 2c56af2997cf93fb23ff0408ecb42ca8512a4226 /libavcodec/vaapi_encode.c | |
parent | 5cc0057f4910c8c72421b812c8f337ef6c43696c (diff) | |
download | ffmpeg-314b421dd8910ebed7a8d419a0dbea239a00044e.tar.gz |
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.
Diffstat (limited to 'libavcodec/vaapi_encode.c')
-rw-r--r-- | libavcodec/vaapi_encode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index dc6cdfef60..b600a00121 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1363,6 +1363,12 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ctx->decode_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) { ctx->codec_sequence_params = av_mallocz(ctx->codec->sequence_params_size); @@ -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 // where it actually overlaps properly, though.) ctx->issue_mode = ISSUE_MODE_MAXIMISE_THROUGHPUT; |