mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-07 07:55:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah264enc: Let FORCE_KEYFRAME be IDR frame rather than just I frame

Browse source 
The FORCE_KEYFRAME frame which has GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME
bit set should be the sync point. So we should let it be an IDR frame to begin
a new GOP, rather than just promote it to an I frame.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6857>
This commit is contained in:
He Junyan 2024-04-09 23:40:41 +08:00 committed by Backport Bot
parent af88e87eec
commit 5e24324f4f
1 changed files with 102 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,6 +229,8 @@ struct _GstVaH264Enc
guint32 ref_num_list1; guint32 ref_num_list1;
guint num_reorder_frames; guint num_reorder_frames;
GstVideoCodecFrame *last_keyframe;
} gop; } gop;
struct struct
@ -1511,6 +1513,7 @@ gst_va_h264_enc_reset_state (GstVaBaseEnc * base)
self->gop.ref_num_list0 = 0; self->gop.ref_num_list0 = 0;
self->gop.ref_num_list1 = 0; self->gop.ref_num_list1 = 0;
self->gop.num_reorder_frames = 0; self->gop.num_reorder_frames = 0;
self->gop.last_keyframe = NULL;
self->rc.max_bitrate = 0; self->rc.max_bitrate = 0;
self->rc.target_bitrate = 0; self->rc.target_bitrate = 0;
@ -1680,58 +1683,97 @@ _push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
{ {
GstVaH264Enc *self = GST_VA_H264_ENC (base); GstVaH264Enc *self = GST_VA_H264_ENC (base);
GstVaH264EncFrame *frame; GstVaH264EncFrame *frame;
gboolean add_cached_key_frame = FALSE;
g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period, g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
FALSE); FALSE);
if (gst_frame) { if (gst_frame) {
/* Begin a new GOP, should have a empty reorder_list. */
if (self->gop.cur_frame_index == self->gop.idr_period) {
g_assert (g_queue_is_empty (&base->reorder_list));
self->gop.cur_frame_index = 0;
self->gop.cur_frame_num = 0;
}
frame = _enc_frame (gst_frame); frame = _enc_frame (gst_frame);
frame->poc =
((self->gop.cur_frame_index * 2) % self->gop.max_pic_order_cnt);
/* TODO: move most this logic onto vabaseenc class */ /* Force to insert the key frame inside a GOP, just end the current
if (self->gop.cur_frame_index == 0) { GOP and start a new one. */
g_assert (frame->poc == 0); if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame) &&
GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts" !(self->gop.cur_frame_index == 0 ||
" a new GOP", gst_frame->system_frame_number); self->gop.cur_frame_index == self->gop.idr_period)) {
GST_DEBUG_OBJECT (base, "system_frame_number: %d is a force key "
"frame(IDR), begin a new GOP.", gst_frame->system_frame_number);
frame->poc = 0;
frame->type = self->gop.frame_types[0].slice_type;
frame->is_ref = self->gop.frame_types[0].is_ref;
frame->pyramid_level = self->gop.frame_types[0].pyramid_level;
frame->left_ref_poc_diff = self->gop.frame_types[0].left_ref_poc_diff;
frame->right_ref_poc_diff = self->gop.frame_types[0].right_ref_poc_diff;
/* The previous key frame should be already be poped out. */
g_assert (self->gop.last_keyframe == NULL);
/* An empty reorder list, start the new GOP immediately. */
if (g_queue_is_empty (&base->reorder_list)) {
self->gop.cur_frame_index = 1;
self->gop.cur_frame_num = 0;
g_queue_clear_full (&base->ref_list,
(GDestroyNotify) gst_video_codec_frame_unref);
last = FALSE;
} else {
/* Cache the key frame and end the current GOP.
Next time calling this push() without frame, start the new GOP. */
self->gop.last_keyframe = gst_frame;
last = TRUE;
}
add_cached_key_frame = TRUE;
} else {
/* Begin a new GOP, should have a empty reorder_list. */
if (self->gop.cur_frame_index == self->gop.idr_period) {
g_assert (g_queue_is_empty (&base->reorder_list));
self->gop.cur_frame_index = 0;
self->gop.cur_frame_num = 0;
}
frame->poc =
((self->gop.cur_frame_index * 2) % self->gop.max_pic_order_cnt);
/* TODO: move most this logic onto vabaseenc class */
if (self->gop.cur_frame_index == 0) {
g_assert (frame->poc == 0);
GST_LOG_OBJECT (self, "system_frame_number: %d, an IDR frame, starts"
" a new GOP", gst_frame->system_frame_number);
g_queue_clear_full (&base->ref_list,
(GDestroyNotify) gst_video_codec_frame_unref);
}
frame->type = self->gop.frame_types[self->gop.cur_frame_index].slice_type;
frame->is_ref = self->gop.frame_types[self->gop.cur_frame_index].is_ref;
frame->pyramid_level =
self->gop.frame_types[self->gop.cur_frame_index].pyramid_level;
frame->left_ref_poc_diff =
self->gop.frame_types[self->gop.cur_frame_index].left_ref_poc_diff;
frame->right_ref_poc_diff =
self->gop.frame_types[self->gop.cur_frame_index].right_ref_poc_diff;
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc,
_slice_type_name (frame->type));
self->gop.cur_frame_index++;
g_queue_push_tail (&base->reorder_list,
gst_video_codec_frame_ref (gst_frame));
}
} else if (self->gop.last_keyframe) {
g_assert (self->gop.last_keyframe ==
g_queue_peek_tail (&base->reorder_list));
if (g_queue_get_length (&base->reorder_list) == 1) {
/* The last cached key frame begins a new GOP */
self->gop.cur_frame_index = 1;
self->gop.cur_frame_num = 0;
self->gop.last_keyframe = NULL;
g_queue_clear_full (&base->ref_list, g_queue_clear_full (&base->ref_list,
(GDestroyNotify) gst_video_codec_frame_unref); (GDestroyNotify) gst_video_codec_frame_unref);
GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (gst_frame);
} }
frame->type = self->gop.frame_types[self->gop.cur_frame_index].slice_type;
frame->is_ref = self->gop.frame_types[self->gop.cur_frame_index].is_ref;
frame->pyramid_level =
self->gop.frame_types[self->gop.cur_frame_index].pyramid_level;
frame->left_ref_poc_diff =
self->gop.frame_types[self->gop.cur_frame_index].left_ref_poc_diff;
frame->right_ref_poc_diff =
self->gop.frame_types[self->gop.cur_frame_index].right_ref_poc_diff;
if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (gst_frame)) {
GST_DEBUG_OBJECT (self, "system_frame_number: %d, a force key frame,"
" promote its type from %s to %s", gst_frame->system_frame_number,
_slice_type_name (frame->type), _slice_type_name (GST_H264_I_SLICE));
frame->type = GST_H264_I_SLICE;
frame->is_ref = TRUE;
}
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc,
_slice_type_name (frame->type));
self->gop.cur_frame_index++;
g_queue_push_tail (&base->reorder_list,
gst_video_codec_frame_ref (gst_frame));
} }
/* ensure the last one a non-B and end the GOP. */ /* ensure the last one a non-B and end the GOP. */
@ -1751,6 +1793,12 @@ _push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
} }
} }
/* Insert the cached next key frame after ending the current GOP. */
if (add_cached_key_frame) {
g_queue_push_tail (&base->reorder_list,
gst_video_codec_frame_ref (gst_frame));
}
return TRUE; return TRUE;
} }
@ -1772,7 +1820,7 @@ _count_backward_ref_num (gpointer data, gpointer user_data)
} }
static GstVideoCodecFrame * static GstVideoCodecFrame *
_pop_pyramid_b_frame (GstVaH264Enc * self) _pop_pyramid_b_frame (GstVaH264Enc * self, guint gop_len)
{ {
GstVaBaseEnc *base = GST_VA_BASE_ENC (self); GstVaBaseEnc *base = GST_VA_BASE_ENC (self);
guint i; guint i;
@ -1787,7 +1835,7 @@ _pop_pyramid_b_frame (GstVaH264Enc * self)
b_vaframe = NULL; b_vaframe = NULL;
/* Find the lowest level with smallest poc. */ /* Find the lowest level with smallest poc. */
for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) { for (i = 0; i < gop_len; i++) {
GstVaH264EncFrame *vaf; GstVaH264EncFrame *vaf;
GstVideoCodecFrame *f; GstVideoCodecFrame *f;
@ -1819,7 +1867,7 @@ again:
/* Check whether its refs are already poped. */ /* Check whether its refs are already poped. */
g_assert (b_vaframe->left_ref_poc_diff != 0); g_assert (b_vaframe->left_ref_poc_diff != 0);
g_assert (b_vaframe->right_ref_poc_diff != 0); g_assert (b_vaframe->right_ref_poc_diff != 0);
for (i = 0; i < g_queue_get_length (&base->reorder_list); i++) { for (i = 0; i < gop_len; i++) {
GstVaH264EncFrame *vaf; GstVaH264EncFrame *vaf;
GstVideoCodecFrame *f; GstVideoCodecFrame *f;
@ -1861,6 +1909,7 @@ _pop_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame ** out_frame)
GstVaH264Enc *self = GST_VA_H264_ENC (base); GstVaH264Enc *self = GST_VA_H264_ENC (base);
GstVaH264EncFrame *vaframe; GstVaH264EncFrame *vaframe;
GstVideoCodecFrame *frame; GstVideoCodecFrame *frame;
guint gop_len;
struct RefFramesCount count; struct RefFramesCount count;
g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period, g_return_val_if_fail (self->gop.cur_frame_index <= self->gop.idr_period,
@ -1871,16 +1920,21 @@ _pop_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame ** out_frame)
if (g_queue_is_empty (&base->reorder_list)) if (g_queue_is_empty (&base->reorder_list))
return TRUE; return TRUE;
gop_len = g_queue_get_length (&base->reorder_list);
if (self->gop.last_keyframe && gop_len > 1)
gop_len--;
/* Return the last pushed non-B immediately. */ /* Return the last pushed non-B immediately. */
frame = g_queue_peek_tail (&base->reorder_list); frame = g_queue_peek_nth (&base->reorder_list, gop_len - 1);
vaframe = _enc_frame (frame); vaframe = _enc_frame (frame);
if (vaframe->type != GST_H264_B_SLICE) { if (vaframe->type != GST_H264_B_SLICE) {
frame = g_queue_pop_tail (&base->reorder_list); frame = g_queue_pop_nth (&base->reorder_list, gop_len - 1);
goto get_one; goto get_one;
} }
if (self->gop.b_pyramid) { if (self->gop.b_pyramid) {
frame = _pop_pyramid_b_frame (self); frame = _pop_pyramid_b_frame (self, gop_len);
if (frame == NULL) if (frame == NULL)
return TRUE; return TRUE;
goto get_one; goto get_one;
@ -3030,6 +3084,7 @@ gst_va_h264_enc_flush (GstVideoEncoder * venc)
/* begin from an IDR after flush. */ /* begin from an IDR after flush. */
self->gop.cur_frame_index = 0; self->gop.cur_frame_index = 0;
self->gop.cur_frame_num = 0; self->gop.cur_frame_num = 0;
self->gop.last_keyframe = NULL;
return GST_VIDEO_ENCODER_CLASS (parent_class)->flush (venc); return GST_VIDEO_ENCODER_CLASS (parent_class)->flush (venc);
} }