virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

vaapi_encode_h264: Enable multiple-slice support

Browse Source
This commit is contained in:
Mark Thompson 2018-09-23 22:52:58 +01:00
parent 29816e278f
commit a769e72c75
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vaapi_encode_h264.c
View File

@ -733,8 +733,6 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR); vpic->pic_fields.bits.idr_pic_flag = (pic->type == PICTURE_TYPE_IDR);
vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B); vpic->pic_fields.bits.reference_pic_flag = (pic->type != PICTURE_TYPE_B);
pic->nb_slices = 1;
return 0; return 0;
} }
@ -758,8 +756,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx,
sh->nal_unit_header.nal_ref_idc = pic->type != PICTURE_TYPE_B; sh->nal_unit_header.nal_ref_idc = pic->type != PICTURE_TYPE_B;
} }
// Only one slice per frame. sh->first_mb_in_slice = slice->block_start;
sh->first_mb_in_slice = 0;
sh->slice_type = priv->slice_type; sh->slice_type = priv->slice_type;
sh->pic_parameter_set_id = pps->pic_parameter_set_id; sh->pic_parameter_set_id = pps->pic_parameter_set_id;
@ -780,8 +777,8 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx,
sh->slice_qp_delta = priv->fixed_qp_idr - (pps->pic_init_qp_minus26 + 26); sh->slice_qp_delta = priv->fixed_qp_idr - (pps->pic_init_qp_minus26 + 26);
vslice->macroblock_address = sh->first_mb_in_slice; vslice->macroblock_address = slice->block_start;
vslice->num_macroblocks = priv->mb_width * priv->mb_height; vslice->num_macroblocks = slice->block_size;
vslice->macroblock_info = VA_INVALID_ID; vslice->macroblock_info = VA_INVALID_ID;
@ -903,6 +900,8 @@ static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = {
static const VAAPIEncodeType vaapi_encode_type_h264 = { static const VAAPIEncodeType vaapi_encode_type_h264 = {
.profiles = vaapi_encode_h264_profiles, .profiles = vaapi_encode_h264_profiles,
.flags = FLAG_SLICE_CONTROL,
.configure = &vaapi_encode_h264_configure, .configure = &vaapi_encode_h264_configure,
.sequence_params_size = sizeof(VAEncSequenceParameterBufferH264), .sequence_params_size = sizeof(VAEncSequenceParameterBufferH264),
@ -978,6 +977,8 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx)
ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_width = FFALIGN(avctx->width, 16);
ctx->surface_height = FFALIGN(avctx->height, 16); ctx->surface_height = FFALIGN(avctx->height, 16);
ctx->slice_block_height = ctx->slice_block_width = 16;
return ff_vaapi_encode_init(avctx); return ff_vaapi_encode_init(avctx);
} }