VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
int i;
- vaapi_encode_h264_write_nal_header(pbc, NAL_SPS, 3);
+ vaapi_encode_h264_write_nal_header(pbc, H264_NAL_SPS, 3);
u(8, mseq_var(profile_idc));
u(1, mseq_var(constraint_set0_flag));
VAAPIEncodeH264Context *priv = ctx->priv_data;
VAAPIEncodeH264MiscSequenceParams *mseq = &priv->misc_sequence_params;
- vaapi_encode_h264_write_nal_header(pbc, NAL_PPS, 3);
+ vaapi_encode_h264_write_nal_header(pbc, H264_NAL_PPS, 3);
ue(vpic_var(pic_parameter_set_id));
ue(vpic_var(seq_parameter_set_id));
VAAPIEncodeContext *ctx,
VAAPIEncodePicture *pic) = NULL;
- vaapi_encode_h264_write_nal_header(pbc, NAL_SEI, 0);
+ vaapi_encode_h264_write_nal_header(pbc, H264_NAL_SEI, 0);
for (payload_type = 0; payload_type < 64; payload_type++) {
switch (payload_type) {
// Try to scale these to a sensible range so that the
// golomb encode of the value is not overlong.
mseq->bit_rate_scale =
- av_clip(av_log2(avctx->bit_rate) - 15, 0, 15);
+ av_clip_uintp2(av_log2(avctx->bit_rate) - 15, 4);
mseq->bit_rate_value_minus1[0] =
(avctx->bit_rate >> mseq->bit_rate_scale) - 1;
mseq->cpb_size_scale =
- av_clip(av_log2(priv->hrd_params.hrd.buffer_size) - 15, 0, 15);
+ av_clip_uintp2(av_log2(priv->hrd_params.hrd.buffer_size) - 15, 4);
mseq->cpb_size_value_minus1[0] =
(priv->hrd_params.hrd.buffer_size >> mseq->cpb_size_scale) - 1;
mslice = &pslice->misc_slice_params;
if (pic->type == PICTURE_TYPE_IDR)
- mslice->nal_unit_type = NAL_IDR_SLICE;
+ mslice->nal_unit_type = H264_NAL_IDR_SLICE;
else
- mslice->nal_unit_type = NAL_SLICE;
+ mslice->nal_unit_type = H264_NAL_SLICE;
switch (pic->type) {
case PICTURE_TYPE_IDR:
{ "b", "0" },
{ "bf", "2" },
{ "g", "120" },
- { "i_qfactor", "1.0" },
- { "i_qoffset", "0.0" },
- { "b_qfactor", "1.2" },
- { "b_qoffset", "0.0" },
+ { "i_qfactor", "1" },
+ { "i_qoffset", "0" },
+ { "b_qfactor", "6/5" },
+ { "b_qoffset", "0" },
{ NULL },
};