mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-14 05:12:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: encoder: h264/5: determine num_ref_idx_active_override_flag according to reference list

Browse source 
Follows the specification as below:

7.4.7.1 in Rec. ITU-T H.265 v4 (12/2016)
num_ref_idx_active_override_flag equal to 1 specifies that the syntax
element num_ref_idx_l0_active_minus1 is present for P and B slices and
that the syntax element num_ref_idx_l1_active_minus1 is present for B
slices.
num_ref_idx_active_override_flag equal to 0 specifies that the syntax
elements num_ref_idx_l0_active_minus1 and num_ref_idx_l1_active_minus1
are not present.

https://bugzilla.gnome.org/show_bug.cgi?id=783804
This commit is contained in:
Hyunjun Ko 2017-09-13 11:17:26 +09:00 committed by Víctor Manuel Jáquez Leal
parent f7886008e3
commit f14563759a
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/vaapi/gstvaapiencoder_h264.c
View file

@ -2080,7 +2080,8 @@ add_slice_headers (GstVaapiEncoderH264 * encoder, GstVaapiEncPicture * picture,
/* only works for B frames */
slice_param->direct_spatial_mv_pred_flag = FALSE;
/* default equal to picture parameters */
slice_param->num_ref_idx_active_override_flag = TRUE;
slice_param->num_ref_idx_active_override_flag = reflist_0_count
|| reflist_1_count;
if (picture->type != GST_VAAPI_PICTURE_TYPE_I && reflist_0_count > 0)
slice_param->num_ref_idx_l0_active_minus1 = reflist_0_count - 1;
else

13
gst-libs/gst/vaapi/gstvaapiencoder_h265.c
View file

@ -661,8 +661,9 @@ bs_write_slice (GstBitWriter * bs,
guint8 no_output_of_prior_pics_flag = 0;
guint8 dependent_slice_segment_flag = 0;
guint8 short_term_ref_pic_set_sps_flag = 0;
guint8 num_ref_idx_active_override_flag = 0;
guint8 slice_deblocking_filter_disabled_flag = 0;
guint8 num_ref_idx_active_override_flag =
slice_param->slice_fields.bits.num_ref_idx_active_override_flag;
/* first_slice_segment_in_pic_flag */
WRITE_UINT32 (bs, encoder->first_slice_segment_in_pic_flag, 1);
@ -752,6 +753,12 @@ bs_write_slice (GstBitWriter * bs,
slice_param->slice_type == GST_H265_B_SLICE) {
/* num_ref_idx_active_override_flag */
WRITE_UINT32 (bs, num_ref_idx_active_override_flag, 1);
if (num_ref_idx_active_override_flag) {
WRITE_UE (bs, slice_param->num_ref_idx_l0_active_minus1);
if (slice_param->slice_type == GST_H265_B_SLICE)
WRITE_UE (bs, slice_param->num_ref_idx_l1_active_minus1);
}
/* mvd_l1_zero_flag */
if (slice_param->slice_type == GST_H265_B_SLICE)
WRITE_UINT32 (bs, slice_param->slice_fields.bits.mvd_l1_zero_flag, 1);
@ -1640,6 +1647,8 @@ add_slice_headers (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
slice_param->slice_type = h265_get_slice_type (picture->type);
slice_param->slice_pic_parameter_set_id = 0;
slice_param->slice_fields.bits.num_ref_idx_active_override_flag =
reflist_0_count || reflist_1_count;
if (picture->type != GST_VAAPI_PICTURE_TYPE_I && reflist_0_count > 0)
slice_param->num_ref_idx_l0_active_minus1 = reflist_0_count - 1;
else
@ -1682,8 +1691,6 @@ add_slice_headers (GstVaapiEncoderH265 * encoder, GstVaapiEncPicture * picture,
slice_param->max_num_merge_cand = 5; /* MaxNumMergeCand */
slice_param->slice_qp_delta = encoder->init_qp - encoder->min_qp;
slice_param->slice_fields.value = 0;
slice_param->slice_fields.bits.
slice_loop_filter_across_slices_enabled_flag = TRUE;