mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 17:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah264enc: Fix intra only stream bug

Browse source 
When we set "ref-frames=0" to generate an intra only stream, the current
encoder just generates an assert and exit with error.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6577>
This commit is contained in:
He Junyan 2024-04-08 21:38:19 +08:00 committed by GStreamer Marge Bot
parent d177eb1a67
commit f3d14d33a8
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
View file

@ -1155,17 +1155,31 @@ create_poc:
self->gop.log2_max_frame_num = _get_log2_max_num (self->gop.idr_period); self->gop.log2_max_frame_num = _get_log2_max_num (self->gop.idr_period);
self->gop.max_frame_num = (1 << self->gop.log2_max_frame_num); self->gop.max_frame_num = (1 << self->gop.log2_max_frame_num);
self->gop.log2_max_pic_order_cnt = self->gop.log2_max_frame_num + 1; self->gop.log2_max_pic_order_cnt = self->gop.log2_max_frame_num + 1;
/* 8.2.1.1 Decoding process for picture order count type 0:
For intra only stream, because all frames are non-ref, poc is
easy to wrap. Need to increase the max poc. */
if (self->gop.ip_period == 0)
self->gop.log2_max_pic_order_cnt++;
self->gop.max_pic_order_cnt = (1 << self->gop.log2_max_pic_order_cnt); self->gop.max_pic_order_cnt = (1 << self->gop.log2_max_pic_order_cnt);
self->gop.num_reorder_frames = self->gop.b_pyramid ?
self->gop.highest_pyramid_level + 1 /* the last P frame. */ :
self->gop.ref_num_list1;
self->gop.num_reorder_frames = MIN (self->gop.num_reorder_frames, 16);
/* Let the DPB contain total refs plus the current frame. */ /* Intra only stream. */
self->gop.max_dec_frame_buffering = self->gop.b_pyramid ? if (self->gop.ip_period == 0) {
self->gop.highest_pyramid_level + 2 + 1 : self->gop.num_ref_frames + 1; self->gop.num_reorder_frames = 0;
g_assert (self->gop.max_dec_frame_buffering <= 16);
self->gop.max_num_ref_frames = self->gop.max_dec_frame_buffering - 1; self->gop.max_dec_frame_buffering = 1 + 1; /* IDR and current frame. */
self->gop.max_num_ref_frames = 0;
} else {
self->gop.num_reorder_frames = self->gop.b_pyramid ?
self->gop.highest_pyramid_level + 1 /* the last P frame. */ :
self->gop.ref_num_list1;
self->gop.num_reorder_frames = MIN (self->gop.num_reorder_frames, 16);
/* Let the DPB contain total refs plus the current frame. */
self->gop.max_dec_frame_buffering = self->gop.b_pyramid ?
self->gop.highest_pyramid_level + 2 + 1 : self->gop.num_ref_frames + 1;
g_assert (self->gop.max_dec_frame_buffering <= 16);
self->gop.max_num_ref_frames = self->gop.max_dec_frame_buffering - 1;
}
_create_gop_frame_types (self); _create_gop_frame_types (self);
_print_gop_structure (self); _print_gop_structure (self);