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

vah26xenc: use gst_h26x_slice_type_to_string()

Browse source 
Rather than custom function.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7337>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-08-06 10:57:56 +02:00
parent d266995323
commit a5651f8b44
2 changed files with 10 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,23 +336,6 @@ static const GstVaH264LevelLimits _va_h264_level_limits[] = {
/* *INDENT-ON* */ /* *INDENT-ON* */
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
static const gchar *
_slice_type_name (GstH264SliceType type)
{
switch (type) {
case GST_H264_P_SLICE:
return "P";
case GST_H264_B_SLICE:
return "B";
case GST_H264_I_SLICE:
return "I";
default:
g_assert_not_reached ();
}
return NULL;
}
static const gchar * static const gchar *
_rate_control_get_name (guint32 rc_mode) _rate_control_get_name (guint32 rc_mode)
{ {
@ -825,7 +808,7 @@ _print_gop_structure (GstVaH264Enc * self)
} }
g_string_append_printf (str, "%s", g_string_append_printf (str, "%s",
_slice_type_name (self->gop.frame_types[i].slice_type)); gst_h264_slice_type_to_string (self->gop.frame_types[i].slice_type));
if (self->gop.b_pyramid if (self->gop.b_pyramid
&& self->gop.frame_types[i].slice_type == GST_H264_B_SLICE) { && self->gop.frame_types[i].slice_type == GST_H264_B_SLICE) {
@ -1828,7 +1811,7 @@ _push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, " GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc, "frame type %s", gst_frame->system_frame_number, frame->poc,
_slice_type_name (frame->type)); gst_h264_slice_type_to_string (frame->type));
self->gop.cur_frame_index++; self->gop.cur_frame_index++;
@ -2054,7 +2037,8 @@ get_one:
} else { } else {
GST_LOG_OBJECT (self, "pop a frame with system_frame_number: %d," GST_LOG_OBJECT (self, "pop a frame with system_frame_number: %d,"
" frame type: %s, poc: %d, frame num: %d, is_ref: %s", " frame type: %s, poc: %d, frame num: %d, is_ref: %s",
frame->system_frame_number, _slice_type_name (vaframe->type), frame->system_frame_number,
gst_h264_slice_type_to_string (vaframe->type),
vaframe->poc, vaframe->frame_num, vaframe->is_ref ? "true" : "false"); vaframe->poc, vaframe->frame_num, vaframe->is_ref ? "true" : "false");
} }
@ -2391,7 +2375,7 @@ _fill_picture_parameter (GstVaH264Enc * self, GstVaH264EncFrame * frame,
if (g_queue_is_empty (&base->ref_list)) { if (g_queue_is_empty (&base->ref_list)) {
GST_ERROR_OBJECT (self, "No reference found for frame type %s", GST_ERROR_OBJECT (self, "No reference found for frame type %s",
_slice_type_name (frame->type)); gst_h264_slice_type_to_string (frame->type));
return FALSE; return FALSE;
} }

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

@ -408,23 +408,6 @@ static const GstVaH265LevelLimits _va_h265_level_limits[] = {
/* *INDENT-ON* */ /* *INDENT-ON* */
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
static const gchar *
_h265_slice_type_name (GstH265SliceType type)
{
switch (type) {
case GST_H265_P_SLICE:
return "P";
case GST_H265_B_SLICE:
return "B";
case GST_H265_I_SLICE:
return "I";
default:
g_assert_not_reached ();
}
return NULL;
}
static const gchar * static const gchar *
_rate_control_get_name (guint32 rc_mode) _rate_control_get_name (guint32 rc_mode)
{ {
@ -1547,7 +1530,7 @@ _h265_fill_picture_parameter (GstVaH265Enc * self, GstVaH265EncFrame * frame,
if (g_queue_is_empty (&base->ref_list)) { if (g_queue_is_empty (&base->ref_list)) {
GST_ERROR_OBJECT (self, "No reference found for frame type %s", GST_ERROR_OBJECT (self, "No reference found for frame type %s",
_h265_slice_type_name (frame->type)); gst_h265_slice_type_to_string (frame->type));
return FALSE; return FALSE;
} }
@ -2099,7 +2082,7 @@ _h265_push_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame * gst_frame,
GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, " GST_LOG_OBJECT (self, "Push frame, system_frame_number: %d, poc %d, "
"frame type %s", gst_frame->system_frame_number, frame->poc, "frame type %s", gst_frame->system_frame_number, frame->poc,
_h265_slice_type_name (frame->type)); gst_h265_slice_type_to_string (frame->type));
self->gop.cur_frame_index++; self->gop.cur_frame_index++;
g_queue_push_tail (&base->reorder_list, g_queue_push_tail (&base->reorder_list,
@ -2317,7 +2300,8 @@ get_one:
} else { } else {
GST_LOG_OBJECT (self, "pop a frame with system_frame_number: %d," GST_LOG_OBJECT (self, "pop a frame with system_frame_number: %d,"
" frame type: %s, poc: %d, is_ref: %s", " frame type: %s, poc: %d, is_ref: %s",
frame->system_frame_number, _h265_slice_type_name (vaframe->type), frame->system_frame_number,
gst_h265_slice_type_to_string (vaframe->type),
vaframe->poc, vaframe->is_ref ? "true" : "false"); vaframe->poc, vaframe->is_ref ? "true" : "false");
} }
@ -3683,7 +3667,7 @@ _h265_print_gop_structure (GstVaH265Enc * self)
g_string_append_printf (str, "%s", "LDB"); g_string_append_printf (str, "%s", "LDB");
} else { } else {
g_string_append_printf (str, "%s", g_string_append_printf (str, "%s",
_h265_slice_type_name (self->gop.frame_types[i].slice_type)); gst_h265_slice_type_to_string (self->gop.frame_types[i].slice_type));
} }
if (self->gop.b_pyramid if (self->gop.b_pyramid