mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-08 09:09:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah26xenc: factorize the encoder frame setup

Browse source 
A simple removal of duplicated code.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6854>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-05-15 15:32:43 +02:00 committed by GStreamer Marge Bot
parent a564440020
commit 0233a2a7cf
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1720,6 +1720,18 @@ gst_va_h264_enc_reconfig (GstVaBaseEnc * base)
return TRUE;
}
static void
frame_setup_from_gop (GstVaH264Enc * self, GstVaH264EncFrame * frame, guint i)
{
g_assert (i >= 0 && i < 1024);
frame->type = self->gop.frame_types[i].slice_type;
frame->is_ref = self->gop.frame_types[i].is_ref;
frame->pyramid_level = self->gop.frame_types[i].pyramid_level;
frame->left_ref_poc_diff = self->gop.frame_types[i].left_ref_poc_diff;
frame->right_ref_poc_diff = self->gop.frame_types[i].right_ref_poc_diff;
}
static gboolean
_push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
gboolean last)
@ -1743,11 +1755,7 @@ _push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
"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;
frame_setup_from_gop (self, frame, 0);
/* The previous key frame should be already be poped out. */
g_assert (self->gop.last_keyframe == NULL);
@ -1788,14 +1796,7 @@ _push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
(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;
frame_setup_from_gop (self, frame, self->gop.cur_frame_index);
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc,

27
subprojects/gst-plugins-bad/sys/va/gstvah265enc.c
View file

@ -2021,6 +2021,18 @@ _h265_encode_one_frame (GstVaH265Enc * self, GstVideoCodecFrame * gst_frame)
return TRUE;
}
static void
frame_setup_from_gop (GstVaH265Enc * self, GstVaH265EncFrame * frame, guint i)
{
g_assert (i >= 0 && i < 1024);
frame->type = self->gop.frame_types[i].slice_type;
frame->is_ref = self->gop.frame_types[i].is_ref;
frame->pyramid_level = self->gop.frame_types[i].pyramid_level;
frame->left_ref_poc_diff = self->gop.frame_types[i].left_ref_poc_diff;
frame->right_ref_poc_diff = self->gop.frame_types[i].right_ref_poc_diff;
}
static gboolean
_h265_push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
gboolean last)
@ -2044,11 +2056,7 @@ _h265_push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
"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;
frame_setup_from_gop (self, frame, 0);
/* The previous key frame should be already be poped out. */
g_assert (self->gop.last_keyframe == NULL);
@ -2086,14 +2094,7 @@ _h265_push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
(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;
frame_setup_from_gop (self, frame, self->gop.cur_frame_index);
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc,