X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvaapi_encode_h264.c;h=f9402992b869d228bba9b7d902ed2b5c95938639;hb=ed5680f37ed30a01933c0158b21e3bb3c8acfe4a;hp=a7f9a602533beb746204b748262db39bfc4434f8;hpb=c1c720d5279aa2e8e0518e2900f5f2b267ee974a;p=ffmpeg diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index a7f9a602533..f9402992b86 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -30,6 +30,7 @@ #include "cbs.h" #include "cbs_h264.h" #include "h264.h" +#include "h264_levels.h" #include "h264_sei.h" #include "internal.h" #include "vaapi_encode.h" @@ -47,6 +48,18 @@ static const uint8_t vaapi_encode_h264_sei_identifier_uuid[16] = { }; typedef struct VAAPIEncodeH264Context { + VAAPIEncodeContext common; + + // User options. + int qp; + int quality; + int coder; + int aud; + int sei; + int profile; + int level; + + // Derived settings. int mb_width; int mb_height; @@ -54,18 +67,7 @@ typedef struct VAAPIEncodeH264Context { int fixed_qp_p; int fixed_qp_b; - H264RawAUD aud; - H264RawSPS sps; - H264RawPPS pps; - H264RawSEI sei; - H264RawSlice slice; - - H264RawSEIBufferingPeriod buffering_period; - H264RawSEIPicTiming pic_timing; - H264RawSEIRecoveryPoint recovery_point; - H264RawSEIUserDataUnregistered identifier; - char *identifier_string; - + // Stream state. int frame_num; int pic_order_cnt; int next_frame_num; @@ -78,32 +80,33 @@ typedef struct VAAPIEncodeH264Context { int cpb_delay; int dpb_delay; + // Writer structures. CodedBitstreamContext *cbc; CodedBitstreamFragment current_access_unit; + + H264RawAUD raw_aud; + H264RawSPS raw_sps; + H264RawPPS raw_pps; + H264RawSEI raw_sei; + H264RawSlice raw_slice; + + H264RawSEIBufferingPeriod sei_buffering_period; + H264RawSEIPicTiming sei_pic_timing; + H264RawSEIRecoveryPoint sei_recovery_point; + H264RawSEIUserDataUnregistered sei_identifier; + char *sei_identifier_string; + int aud_needed; int sei_needed; int sei_cbr_workaround_needed; } VAAPIEncodeH264Context; -typedef struct VAAPIEncodeH264Options { - int qp; - int quality; - int low_power; - // Entropy encoder type. - int coder; - int aud; - int sei; - int profile; - int level; -} VAAPIEncodeH264Options; - static int vaapi_encode_h264_write_access_unit(AVCodecContext *avctx, char *data, size_t *data_len, CodedBitstreamFragment *au) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; int err; err = ff_cbs_write_fragment_data(priv->cbc, au); @@ -129,13 +132,12 @@ static int vaapi_encode_h264_add_nal(AVCodecContext *avctx, CodedBitstreamFragment *au, void *nal_unit) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; H264RawNALUnitHeader *header = nal_unit; int err; err = ff_cbs_insert_unit_content(priv->cbc, au, -1, - header->nal_unit_type, nal_unit); + header->nal_unit_type, nal_unit, NULL); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to add NAL unit: " "type = %d.\n", header->nal_unit_type); @@ -148,23 +150,22 @@ static int vaapi_encode_h264_add_nal(AVCodecContext *avctx, static int vaapi_encode_h264_write_sequence_header(AVCodecContext *avctx, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; CodedBitstreamFragment *au = &priv->current_access_unit; int err; if (priv->aud_needed) { - err = vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_aud); if (err < 0) goto fail; priv->aud_needed = 0; } - err = vaapi_encode_h264_add_nal(avctx, au, &priv->sps); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_sps); if (err < 0) goto fail; - err = vaapi_encode_h264_add_nal(avctx, au, &priv->pps); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_pps); if (err < 0) goto fail; @@ -179,19 +180,18 @@ static int vaapi_encode_h264_write_slice_header(AVCodecContext *avctx, VAAPIEncodeSlice *slice, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; CodedBitstreamFragment *au = &priv->current_access_unit; int err; if (priv->aud_needed) { - err = vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_aud); if (err < 0) goto fail; priv->aud_needed = 0; } - err = vaapi_encode_h264_add_nal(avctx, au, &priv->slice); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_slice); if (err < 0) goto fail; @@ -206,49 +206,53 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, int index, int *type, char *data, size_t *data_len) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; - VAAPIEncodeH264Options *opt = ctx->codec_options; + VAAPIEncodeH264Context *priv = avctx->priv_data; CodedBitstreamFragment *au = &priv->current_access_unit; int err, i; if (priv->sei_needed) { + H264RawSEI *sei = &priv->raw_sei; + if (priv->aud_needed) { - err = vaapi_encode_h264_add_nal(avctx, au, &priv->aud); + err = vaapi_encode_h264_add_nal(avctx, au, &priv->raw_aud); if (err < 0) goto fail; priv->aud_needed = 0; } - memset(&priv->sei, 0, sizeof(priv->sei)); - priv->sei.nal_unit_header.nal_unit_type = H264_NAL_SEI; + *sei = (H264RawSEI) { + .nal_unit_header = { + .nal_unit_type = H264_NAL_SEI, + }, + }; i = 0; - if (pic->encode_order == 0 && opt->sei & SEI_IDENTIFIER) { - priv->sei.payload[i].payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED; - priv->sei.payload[i].payload.user_data_unregistered = priv->identifier; + + if (priv->sei_needed & SEI_IDENTIFIER) { + sei->payload[i].payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED; + sei->payload[i].payload.user_data_unregistered = priv->sei_identifier; ++i; } - if (opt->sei & SEI_TIMING) { + if (priv->sei_needed & SEI_TIMING) { if (pic->type == PICTURE_TYPE_IDR) { - priv->sei.payload[i].payload_type = H264_SEI_TYPE_BUFFERING_PERIOD; - priv->sei.payload[i].payload.buffering_period = priv->buffering_period; + sei->payload[i].payload_type = H264_SEI_TYPE_BUFFERING_PERIOD; + sei->payload[i].payload.buffering_period = priv->sei_buffering_period; ++i; } - priv->sei.payload[i].payload_type = H264_SEI_TYPE_PIC_TIMING; - priv->sei.payload[i].payload.pic_timing = priv->pic_timing; + sei->payload[i].payload_type = H264_SEI_TYPE_PIC_TIMING; + sei->payload[i].payload.pic_timing = priv->sei_pic_timing; ++i; } - if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { - priv->sei.payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT; - priv->sei.payload[i].payload.recovery_point = priv->recovery_point; + if (priv->sei_needed & SEI_RECOVERY_POINT) { + sei->payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT; + sei->payload[i].payload.recovery_point = priv->sei_recovery_point; ++i; } - priv->sei.payload_count = i; - av_assert0(priv->sei.payload_count > 0); + sei->payload_count = i; + av_assert0(sei->payload_count > 0); - err = vaapi_encode_h264_add_nal(avctx, au, &priv->sei); + err = vaapi_encode_h264_add_nal(avctx, au, sei); if (err < 0) goto fail; priv->sei_needed = 0; @@ -286,12 +290,12 @@ fail: static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; - VAAPIEncodeH264Options *opt = ctx->codec_options; - H264RawSPS *sps = &priv->sps; - H264RawPPS *pps = &priv->pps; + VAAPIEncodeH264Context *priv = avctx->priv_data; + H264RawSPS *sps = &priv->raw_sps; + H264RawPPS *pps = &priv->raw_pps; VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params; + int dpb_frames; memset(&priv->current_access_unit, 0, sizeof(priv->current_access_unit)); @@ -303,12 +307,46 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->nal_unit_header.nal_unit_type = H264_NAL_SPS; sps->profile_idc = avctx->profile & 0xff; - sps->constraint_set1_flag = - !!(avctx->profile & FF_PROFILE_H264_CONSTRAINED); - sps->constraint_set3_flag = - !!(avctx->profile & FF_PROFILE_H264_INTRA); - sps->level_idc = avctx->level; + if (avctx->profile == FF_PROFILE_H264_CONSTRAINED_BASELINE || + avctx->profile == FF_PROFILE_H264_MAIN) + sps->constraint_set1_flag = 1; + + if (avctx->profile == FF_PROFILE_H264_HIGH) + sps->constraint_set3_flag = ctx->gop_size == 1; + + if (avctx->profile == FF_PROFILE_H264_MAIN || + avctx->profile == FF_PROFILE_H264_HIGH) { + sps->constraint_set4_flag = 1; + sps->constraint_set5_flag = ctx->b_per_p == 0; + } + + if (ctx->gop_size == 1) + dpb_frames = 0; + else + dpb_frames = 1 + (ctx->b_per_p > 0); + + if (avctx->level != FF_LEVEL_UNKNOWN) { + sps->level_idc = avctx->level; + } else { + const H264LevelDescriptor *level; + + level = ff_h264_guess_level(sps->profile_idc, + avctx->bit_rate, + priv->mb_width * 16, + priv->mb_height * 16, + dpb_frames); + if (level) { + av_log(avctx, AV_LOG_VERBOSE, "Using level %s.\n", level->name); + if (level->constraint_set3_flag) + sps->constraint_set3_flag = 1; + sps->level_idc = level->level_idc; + } else { + av_log(avctx, AV_LOG_WARNING, "Stream will not conform " + "to any level: using level 6.2.\n"); + sps->level_idc = 62; + } + } sps->seq_parameter_set_id = 0; sps->chroma_format_idc = 1; @@ -318,9 +356,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->log2_max_pic_order_cnt_lsb_minus4 = av_clip(av_log2(ctx->b_per_p + 1) - 2, 0, 12); - sps->max_num_ref_frames = - (avctx->profile & FF_PROFILE_H264_INTRA) ? 0 : - 1 + (ctx->b_per_p > 0); + sps->max_num_ref_frames = dpb_frames; sps->pic_width_in_mbs_minus1 = priv->mb_width - 1; sps->pic_height_in_map_units_minus1 = priv->mb_height - 1; @@ -353,18 +389,20 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) { 80, 33 }, { 18, 11 }, { 15, 11 }, { 64, 33 }, { 160, 99 }, { 4, 3 }, { 3, 2 }, { 2, 1 }, }; - int i; + int num, den, i; + av_reduce(&num, &den, avctx->sample_aspect_ratio.num, + avctx->sample_aspect_ratio.den, 65535); for (i = 0; i < FF_ARRAY_ELEMS(sar_idc); i++) { - if (avctx->sample_aspect_ratio.num == sar_idc[i].num && - avctx->sample_aspect_ratio.den == sar_idc[i].den) { + if (num == sar_idc[i].num && + den == sar_idc[i].den) { sps->vui.aspect_ratio_idc = i; break; } } if (i >= FF_ARRAY_ELEMS(sar_idc)) { sps->vui.aspect_ratio_idc = 255; - sps->vui.sar_width = avctx->sample_aspect_ratio.num; - sps->vui.sar_height = avctx->sample_aspect_ratio.den; + sps->vui.sar_width = num; + sps->vui.sar_height = den; } sps->vui.aspect_ratio_info_present_flag = 1; } @@ -412,8 +450,9 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->vui.fixed_frame_rate_flag = 0; } - if (opt->sei & SEI_TIMING) { + if (priv->sei & SEI_TIMING) { H264RawHRD *hrd = &sps->vui.nal_hrd_parameters; + H264RawSEIBufferingPeriod *bp = &priv->sei_buffering_period; sps->vui.nal_hrd_parameters_present_flag = 1; @@ -422,9 +461,9 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) // Try to scale these to a sensible range so that the // golomb encode of the value is not overlong. hrd->bit_rate_scale = - av_clip_uintp2(av_log2(avctx->bit_rate) - 15 - 6, 4); + av_clip_uintp2(av_log2(ctx->va_bit_rate) - 15 - 6, 4); hrd->bit_rate_value_minus1[0] = - (avctx->bit_rate >> hrd->bit_rate_scale + 6) - 1; + (ctx->va_bit_rate >> hrd->bit_rate_scale + 6) - 1; hrd->cpb_size_scale = av_clip_uintp2(av_log2(ctx->hrd_params.hrd.buffer_size) - 15 - 4, 4); @@ -440,13 +479,13 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) hrd->dpb_output_delay_length_minus1 = 7; hrd->time_offset_length = 0; - priv->buffering_period.seq_parameter_set_id = sps->seq_parameter_set_id; + bp->seq_parameter_set_id = sps->seq_parameter_set_id; // This calculation can easily overflow 32 bits. - priv->buffering_period.nal.initial_cpb_removal_delay[0] = 90000 * + bp->nal.initial_cpb_removal_delay[0] = 90000 * (uint64_t)ctx->hrd_params.hrd.initial_buffer_fullness / ctx->hrd_params.hrd.buffer_size; - priv->buffering_period.nal.initial_cpb_removal_delay_offset[0] = 0; + bp->nal.initial_cpb_removal_delay_offset[0] = 0; } else { sps->vui.nal_hrd_parameters_present_flag = 0; sps->vui.low_delay_hrd_flag = 1 - sps->vui.fixed_frame_rate_flag; @@ -454,8 +493,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->vui.bitstream_restriction_flag = 1; sps->vui.motion_vectors_over_pic_boundaries_flag = 1; - sps->vui.log2_max_mv_length_horizontal = 16; - sps->vui.log2_max_mv_length_vertical = 16; + sps->vui.log2_max_mv_length_horizontal = 15; + sps->vui.log2_max_mv_length_vertical = 15; sps->vui.max_num_reorder_frames = (ctx->b_per_p > 0); sps->vui.max_dec_frame_buffering = sps->max_num_ref_frames; @@ -469,7 +508,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) !(sps->profile_idc == FF_PROFILE_H264_BASELINE || sps->profile_idc == FF_PROFILE_H264_EXTENDED || sps->profile_idc == FF_PROFILE_H264_CAVLC_444); - if (!opt->coder && pps->entropy_coding_mode_flag) + if (!priv->coder && pps->entropy_coding_mode_flag) pps->entropy_coding_mode_flag = 0; pps->num_ref_idx_l0_default_active_minus1 = 0; @@ -490,11 +529,11 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) *vseq = (VAEncSequenceParameterBufferH264) { .seq_parameter_set_id = sps->seq_parameter_set_id, .level_idc = sps->level_idc, - .intra_period = avctx->gop_size, - .intra_idr_period = avctx->gop_size, + .intra_period = ctx->gop_size, + .intra_idr_period = ctx->gop_size, .ip_period = ctx->b_per_p + 1, - .bits_per_second = avctx->bit_rate, + .bits_per_second = ctx->va_bit_rate, .max_num_ref_frames = sps->max_num_ref_frames, .picture_width_in_mbs = sps->pic_width_in_mbs_minus1 + 1, .picture_height_in_mbs = sps->pic_height_in_map_units_minus1 + 1, @@ -577,9 +616,8 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, VAAPIEncodePicture *pic) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; - VAAPIEncodeH264Options *opt = ctx->codec_options; - H264RawSPS *sps = &priv->sps; + VAAPIEncodeH264Context *priv = avctx->priv_data; + H264RawSPS *sps = &priv->raw_sps; VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params; int i; @@ -620,36 +658,44 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->pic_order_cnt = pic->display_order - priv->last_idr_frame; priv->dpb_delay = pic->display_order - pic->encode_order + 1; - if (opt->aud) { + if (priv->aud) { priv->aud_needed = 1; - priv->aud.nal_unit_header.nal_unit_type = H264_NAL_AUD; - priv->aud.primary_pic_type = priv->primary_pic_type; + priv->raw_aud = (H264RawAUD) { + .nal_unit_header = { + .nal_unit_type = H264_NAL_AUD, + }, + .primary_pic_type = priv->primary_pic_type, + }; } else { priv->aud_needed = 0; } - if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0) - priv->sei_needed = 1; + priv->sei_needed = 0; + + if (priv->sei & SEI_IDENTIFIER && pic->encode_order == 0) + priv->sei_needed |= SEI_IDENTIFIER; #if !CONFIG_VAAPI_1 if (ctx->va_rc_mode == VA_RC_CBR) priv->sei_cbr_workaround_needed = 1; #endif - if (opt->sei & SEI_TIMING) { - memset(&priv->pic_timing, 0, sizeof(priv->pic_timing)); - - priv->pic_timing.cpb_removal_delay = 2 * priv->cpb_delay; - priv->pic_timing.dpb_output_delay = 2 * priv->dpb_delay; + if (priv->sei & SEI_TIMING) { + priv->sei_pic_timing = (H264RawSEIPicTiming) { + .cpb_removal_delay = 2 * priv->cpb_delay, + .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) { - priv->recovery_point.recovery_frame_cnt = 0; - priv->recovery_point.exact_match_flag = 1; - priv->recovery_point.broken_link_flag = ctx->b_per_p > 0; + if (priv->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { + priv->sei_recovery_point = (H264RawSEIRecoveryPoint) { + .recovery_frame_cnt = 0, + .exact_match_flag = 1, + .broken_link_flag = ctx->b_per_p > 0, + }; - priv->sei_needed = 1; + priv->sei_needed |= SEI_RECOVERY_POINT; } vpic->CurrPic = (VAPictureH264) { @@ -689,8 +735,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.reference_pic_flag = (pic->type != PICTURE_TYPE_B); - pic->nb_slices = 1; - return 0; } @@ -698,11 +742,10 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, VAAPIEncodePicture *pic, VAAPIEncodeSlice *slice) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; - H264RawSPS *sps = &priv->sps; - H264RawPPS *pps = &priv->pps; - H264RawSliceHeader *sh = &priv->slice.header; + VAAPIEncodeH264Context *priv = avctx->priv_data; + H264RawSPS *sps = &priv->raw_sps; + H264RawPPS *pps = &priv->raw_pps; + H264RawSliceHeader *sh = &priv->raw_slice.header; VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params; VAEncSliceParameterBufferH264 *vslice = slice->codec_slice_params; int i; @@ -715,8 +758,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, sh->nal_unit_header.nal_ref_idc = pic->type != PICTURE_TYPE_B; } - // Only one slice per frame. - sh->first_mb_in_slice = 0; + sh->first_mb_in_slice = slice->block_start; sh->slice_type = priv->slice_type; sh->pic_parameter_set_id = pps->pic_parameter_set_id; @@ -737,8 +779,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); - vslice->macroblock_address = sh->first_mb_in_slice; - vslice->num_macroblocks = priv->mb_width * priv->mb_height; + vslice->macroblock_address = slice->block_start; + vslice->num_macroblocks = slice->block_size; vslice->macroblock_info = VA_INVALID_ID; @@ -778,8 +820,7 @@ static int vaapi_encode_h264_init_slice_params(AVCodecContext *avctx, static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; - VAAPIEncodeH264Options *opt = ctx->codec_options; + VAAPIEncodeH264Context *priv = avctx->priv_data; int err; err = ff_cbs_init(&priv->cbc, AV_CODEC_ID_H264, avctx); @@ -790,7 +831,7 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) priv->mb_height = FFALIGN(avctx->height, 16) / 16; if (ctx->va_rc_mode == VA_RC_CQP) { - priv->fixed_qp_p = opt->qp; + priv->fixed_qp_p = priv->qp; if (avctx->i_quant_factor > 0.0) priv->fixed_qp_idr = (int)((priv->fixed_qp_p * avctx->i_quant_factor + avctx->i_quant_offset) + 0.5); @@ -802,7 +843,7 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) else priv->fixed_qp_b = priv->fixed_qp_p; - opt->sei &= ~SEI_TIMING; + priv->sei &= ~SEI_TIMING; av_log(avctx, AV_LOG_DEBUG, "Using fixed QP = " "%d / %d / %d for IDR- / P- / B-frames.\n", @@ -815,26 +856,19 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) priv->fixed_qp_p = 26; priv->fixed_qp_b = 26; - av_log(avctx, AV_LOG_DEBUG, "Using %s-bitrate = %"PRId64" bps.\n", - ctx->va_rc_mode == VA_RC_CBR ? "constant" : "variable", - avctx->bit_rate); - } else { av_assert0(0 && "Invalid RC mode."); } - if (avctx->compression_level == FF_COMPRESSION_DEFAULT) - avctx->compression_level = opt->quality; - - if (opt->sei & SEI_IDENTIFIER) { + if (priv->sei & SEI_IDENTIFIER) { const char *lavc = LIBAVCODEC_IDENT; const char *vaapi = VA_VERSION_S; const char *driver; int len; - memcpy(priv->identifier.uuid_iso_iec_11578, + memcpy(priv->sei_identifier.uuid_iso_iec_11578, vaapi_encode_h264_sei_identifier_uuid, - sizeof(priv->identifier.uuid_iso_iec_11578)); + sizeof(priv->sei_identifier.uuid_iso_iec_11578)); driver = vaQueryVendorString(ctx->hwctx->display); if (!driver) @@ -842,23 +876,33 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) len = snprintf(NULL, 0, "%s / VAAPI %s / %s", lavc, vaapi, driver); if (len >= 0) { - priv->identifier_string = av_malloc(len + 1); - if (!priv->identifier_string) + priv->sei_identifier_string = av_malloc(len + 1); + if (!priv->sei_identifier_string) return AVERROR(ENOMEM); - snprintf(priv->identifier_string, len + 1, + snprintf(priv->sei_identifier_string, len + 1, "%s / VAAPI %s / %s", lavc, vaapi, driver); - priv->identifier.data = priv->identifier_string; - priv->identifier.data_length = len + 1; + priv->sei_identifier.data = priv->sei_identifier_string; + priv->sei_identifier.data_length = len + 1; } } return 0; } +static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = { + { FF_PROFILE_H264_HIGH, 8, 3, 1, 1, VAProfileH264High }, + { FF_PROFILE_H264_MAIN, 8, 3, 1, 1, VAProfileH264Main }, + { FF_PROFILE_H264_CONSTRAINED_BASELINE, + 8, 3, 1, 1, VAProfileH264ConstrainedBaseline }, + { FF_PROFILE_UNKNOWN } +}; + static const VAAPIEncodeType vaapi_encode_type_h264 = { - .priv_data_size = sizeof(VAAPIEncodeH264Context), + .profiles = vaapi_encode_h264_profiles, + + .flags = FLAG_SLICE_CONTROL, .configure = &vaapi_encode_h264_configure, @@ -882,41 +926,29 @@ static const VAAPIEncodeType vaapi_encode_type_h264 = { static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Options *opt = - (VAAPIEncodeH264Options*)ctx->codec_options_data; + VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; ctx->codec = &vaapi_encode_type_h264; if (avctx->profile == FF_PROFILE_UNKNOWN) - avctx->profile = opt->profile; + avctx->profile = priv->profile; if (avctx->level == FF_LEVEL_UNKNOWN) - avctx->level = opt->level; + avctx->level = priv->level; + if (avctx->compression_level == FF_COMPRESSION_DEFAULT) + avctx->compression_level = priv->quality; + // Reject unsupported profiles. switch (avctx->profile) { case FF_PROFILE_H264_BASELINE: av_log(avctx, AV_LOG_WARNING, "H.264 baseline profile is not " "supported, using constrained baseline profile instead.\n"); avctx->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; - case FF_PROFILE_H264_CONSTRAINED_BASELINE: - ctx->va_profile = VAProfileH264ConstrainedBaseline; - if (avctx->max_b_frames != 0) { - avctx->max_b_frames = 0; - av_log(avctx, AV_LOG_WARNING, "H.264 constrained baseline profile " - "doesn't support encoding with B frames, disabling them.\n"); - } - break; - case FF_PROFILE_H264_MAIN: - ctx->va_profile = VAProfileH264Main; break; case FF_PROFILE_H264_EXTENDED: av_log(avctx, AV_LOG_ERROR, "H.264 extended profile " "is not supported.\n"); return AVERROR_PATCHWELCOME; - case FF_PROFILE_UNKNOWN: - case FF_PROFILE_H264_HIGH: - ctx->va_profile = VAProfileH264High; - break; case FF_PROFILE_H264_HIGH_10: case FF_PROFILE_H264_HIGH_10_INTRA: av_log(avctx, AV_LOG_ERROR, "H.264 10-bit profiles " @@ -931,35 +963,15 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "H.264 non-4:2:0 profiles " "are not supported.\n"); return AVERROR_PATCHWELCOME; - default: - av_log(avctx, AV_LOG_ERROR, "Unknown H.264 profile %d.\n", - avctx->profile); - return AVERROR(EINVAL); } - if (opt->low_power) { -#if VA_CHECK_VERSION(0, 39, 2) - ctx->va_entrypoint = VAEntrypointEncSliceLP; -#else - av_log(avctx, AV_LOG_ERROR, "Low-power encoding is not " - "supported with this VAAPI version.\n"); + + if (avctx->level != FF_LEVEL_UNKNOWN && avctx->level & ~0xff) { + av_log(avctx, AV_LOG_ERROR, "Invalid level %d: must fit " + "in 8-bit unsigned integer.\n", avctx->level); return AVERROR(EINVAL); -#endif - } else { - ctx->va_entrypoint = VAEntrypointEncSlice; } - // Only 8-bit encode is supported. - ctx->va_rt_format = VA_RT_FORMAT_YUV420; - - if (avctx->bit_rate > 0) { - if (avctx->rc_max_rate == avctx->bit_rate) - ctx->va_rc_mode = VA_RC_CBR; - else - ctx->va_rc_mode = VA_RC_VBR; - } else - ctx->va_rc_mode = VA_RC_CQP; - - ctx->va_packed_headers = + ctx->desired_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | // SPS and PPS. VA_ENC_PACKED_HEADER_SLICE | // Slice headers. VA_ENC_PACKED_HEADER_MISC; // SEI. @@ -967,33 +979,30 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) ctx->surface_width = FFALIGN(avctx->width, 16); ctx->surface_height = FFALIGN(avctx->height, 16); + ctx->slice_block_height = ctx->slice_block_width = 16; + return ff_vaapi_encode_init(avctx); } static av_cold int vaapi_encode_h264_close(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; - VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Context *priv = avctx->priv_data; - if (priv) { - ff_cbs_close(&priv->cbc); - av_freep(&priv->identifier_string); - } + ff_cbs_close(&priv->cbc); + av_freep(&priv->sei_identifier_string); return ff_vaapi_encode_close(avctx); } -#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \ - offsetof(VAAPIEncodeH264Options, x)) +#define OFFSET(x) offsetof(VAAPIEncodeH264Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h264_options[] = { + VAAPI_ENCODE_COMMON_OPTIONS, + { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, { "quality", "Set encode quality (trades off against speed, higher is faster)", - OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 8, FLAGS }, - { "low_power", "Use low-power encoding mode (experimental: only supported " - "on some platforms, does not support all features)", - OFFSET(low_power), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS }, + OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "coder", "Entropy coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS, "coder" }, @@ -1002,7 +1011,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "ac", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, FLAGS, "coder" }, { "aud", "Include AUD", - OFFSET(aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS }, + OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, @@ -1020,7 +1029,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "profile", "Set profile (profile_idc and constraint_set*_flag)", OFFSET(profile), AV_OPT_TYPE_INT, - { .i64 = FF_PROFILE_H264_HIGH }, 0x0000, 0xffff, FLAGS, "profile" }, + { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, 0xffff, FLAGS, "profile" }, #define PROFILE(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ { .i64 = value }, 0, 0, FLAGS, "profile" @@ -1031,7 +1040,7 @@ static const AVOption vaapi_encode_h264_options[] = { { "level", "Set level (level_idc)", OFFSET(level), AV_OPT_TYPE_INT, - { .i64 = 51 }, 0x00, 0xff, FLAGS, "level" }, + { .i64 = FF_LEVEL_UNKNOWN }, FF_LEVEL_UNKNOWN, 0xff, FLAGS, "level" }, #define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ { .i64 = value }, 0, 0, FLAGS, "level" @@ -1067,7 +1076,8 @@ static const AVCodecDefault vaapi_encode_h264_defaults[] = { { "i_qoffset", "0" }, { "b_qfactor", "6/5" }, { "b_qoffset", "0" }, - { "qmin", "0" }, + { "qmin", "-1" }, + { "qmax", "-1" }, { NULL }, }; @@ -1083,8 +1093,7 @@ AVCodec ff_h264_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("H.264/AVC (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, - .priv_data_size = (sizeof(VAAPIEncodeContext) + - sizeof(VAAPIEncodeH264Options)), + .priv_data_size = sizeof(VAAPIEncodeH264Context), .init = &vaapi_encode_h264_init, .encode2 = &ff_vaapi_encode2, .close = &vaapi_encode_h264_close,