RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vaapi_encode_h264: Take VAAPIEncodeH264Context::sei_needed as an ORed value 

We may check priv->sei_needed only when writing SEI messages.

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Haihao Xiang 2018-05-03 13:51:48 +08:00 committed by Mark Thompson
parent f43fd68f28
commit 314994051b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/vaapi_encode_h264.c
View File

@ -208,7 +208,6 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx,
{ {
VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodeH264Context *priv = ctx->priv_data; VAAPIEncodeH264Context *priv = ctx->priv_data;
VAAPIEncodeH264Options *opt = ctx->codec_options;
CodedBitstreamFragment *au = &priv->current_access_unit; CodedBitstreamFragment *au = &priv->current_access_unit;
int err, i; int err, i;
@ -224,12 +223,12 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx,
priv->sei.nal_unit_header.nal_unit_type = H264_NAL_SEI; priv->sei.nal_unit_header.nal_unit_type = H264_NAL_SEI;
i = 0; i = 0;
if (pic->encode_order == 0 && opt->sei & SEI_IDENTIFIER) { if (priv->sei_needed & SEI_IDENTIFIER) {
priv->sei.payload[i].payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED; priv->sei.payload[i].payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED;
priv->sei.payload[i].payload.user_data_unregistered = priv->identifier; priv->sei.payload[i].payload.user_data_unregistered = priv->identifier;
++i; ++i;
} }
if (opt->sei & SEI_TIMING) { if (priv->sei_needed & SEI_TIMING) {
if (pic->type == PICTURE_TYPE_IDR) { if (pic->type == PICTURE_TYPE_IDR) {
priv->sei.payload[i].payload_type = H264_SEI_TYPE_BUFFERING_PERIOD; priv->sei.payload[i].payload_type = H264_SEI_TYPE_BUFFERING_PERIOD;
priv->sei.payload[i].payload.buffering_period = priv->buffering_period; priv->sei.payload[i].payload.buffering_period = priv->buffering_period;
@ -239,7 +238,7 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx,
priv->sei.payload[i].payload.pic_timing = priv->pic_timing; priv->sei.payload[i].payload.pic_timing = priv->pic_timing;
++i; ++i;
} }
if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { if (priv->sei_needed & SEI_RECOVERY_POINT) {
priv->sei.payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT; priv->sei.payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT;
priv->sei.payload[i].payload.recovery_point = priv->recovery_point; priv->sei.payload[i].payload.recovery_point = priv->recovery_point;
++i; ++i;
@ -628,8 +627,10 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
priv->aud_needed = 0; priv->aud_needed = 0;
} }
priv->sei_needed = 0;
if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0) if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0)
priv->sei_needed = 1; priv->sei_needed |= SEI_IDENTIFIER;
#if !CONFIG_VAAPI_1 #if !CONFIG_VAAPI_1
if (ctx->va_rc_mode == VA_RC_CBR) if (ctx->va_rc_mode == VA_RC_CBR)
priv->sei_cbr_workaround_needed = 1; priv->sei_cbr_workaround_needed = 1;
@ -641,7 +642,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
priv->pic_timing.cpb_removal_delay = 2 * priv->cpb_delay; priv->pic_timing.cpb_removal_delay = 2 * priv->cpb_delay;
priv->pic_timing.dpb_output_delay = 2 * priv->dpb_delay; priv->pic_timing.dpb_output_delay = 2 * priv->dpb_delay;
priv->sei_needed = 1; priv->sei_needed |= SEI_TIMING;
} }
if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) {
@ -649,7 +650,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
priv->recovery_point.exact_match_flag = 1; priv->recovery_point.exact_match_flag = 1;
priv->recovery_point.broken_link_flag = ctx->b_per_p > 0; priv->recovery_point.broken_link_flag = ctx->b_per_p > 0;
priv->sei_needed = 1; priv->sei_needed |= SEI_RECOVERY_POINT;
} }
vpic->CurrPic = (VAPictureH264) { vpic->CurrPic = (VAPictureH264) {