mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

vabaseenc: Reduce logging noise if finish_frame fails.

Browse source 
Fixes: #1579
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3423>
This commit is contained in:
Víctor Manuel Jáquez Leal 2022-11-16 19:39:47 +01:00 committed by GStreamer Marge Bot
parent 64aad21f98
commit b2bfb066ec
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c
View file

@ -451,7 +451,6 @@ _push_buffer_to_downstream (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
{ {
GstVaEncodePicture *enc_picture; GstVaEncodePicture *enc_picture;
GstVaBaseEncClass *base_class = GST_VA_BASE_ENC_GET_CLASS (base); GstVaBaseEncClass *base_class = GST_VA_BASE_ENC_GET_CLASS (base);
GstFlowReturn ret;
GstBuffer *buf; GstBuffer *buf;
if (base_class->prepare_output) if (base_class->prepare_output)
@ -476,8 +475,7 @@ _push_buffer_to_downstream (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
GST_TIME_ARGS (frame->dts), GST_TIME_ARGS (frame->duration), GST_TIME_ARGS (frame->dts), GST_TIME_ARGS (frame->duration),
gst_buffer_get_size (frame->output_buffer)); gst_buffer_get_size (frame->output_buffer));
ret = gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (base), frame); return gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (base), frame);
return ret;
error: error:
gst_clear_buffer (&frame->output_buffer); gst_clear_buffer (&frame->output_buffer);
@ -502,7 +500,7 @@ _push_out_one_buffer (GstVaBaseEnc * base)
ret = _push_buffer_to_downstream (base, frame_out); ret = _push_buffer_to_downstream (base, frame_out);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
GST_ERROR_OBJECT (base, "fails to push one buffer, system_frame_number " GST_DEBUG_OBJECT (base, "fails to push one buffer, system_frame_number "
"%d: %s", system_frame_number, gst_flow_get_name (ret)); "%d: %s", system_frame_number, gst_flow_get_name (ret));
} }
@ -658,11 +656,8 @@ gst_va_base_enc_handle_frame (GstVideoEncoder * venc,
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto error_encode; goto error_encode;
while (g_queue_get_length (&base->output_list) > 0) { while (g_queue_get_length (&base->output_list) > 0)
ret = _push_out_one_buffer (base); ret = _push_out_one_buffer (base);
if (ret != GST_FLOW_OK)
goto error_push_buffer;
}
frame_encode = NULL; frame_encode = NULL;
if (!base_class->reorder_frame (base, NULL, FALSE, &frame_encode)) if (!base_class->reorder_frame (base, NULL, FALSE, &frame_encode))
@ -705,12 +700,6 @@ error_encode:
gst_video_encoder_finish_frame (venc, frame_encode); gst_video_encoder_finish_frame (venc, frame_encode);
return ret; return ret;
} }
error_push_buffer:
{
GST_ELEMENT_ERROR (venc, STREAM, ENCODE,
("Failed to push the buffer: %s.", gst_flow_get_name (ret)), (NULL));
return ret;
}
} }
static GstFlowReturn static GstFlowReturn