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

svtjpegxsdec: drop frames that had decoding errors

Browse source 
Follow-up to !8163

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8219>
This commit is contained in:
Tim-Philipp Müller 2024-12-25 22:40:06 +01:00 committed by GStreamer Marge Bot
parent a589575bd8
commit 71aacec532
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-bad/ext/svtjpegxs/gstsvtjpegxsdec.c
View file

@ -30,6 +30,8 @@
GST_DEBUG_CATEGORY_STATIC (svtjpegxsdec_debug); GST_DEBUG_CATEGORY_STATIC (svtjpegxsdec_debug);
#define GST_CAT_DEFAULT svtjpegxsdec_debug #define GST_CAT_DEFAULT svtjpegxsdec_debug
#define GST_JPEG_XS_DEC_FLOW_DROP_FRAME (GST_FLOW_CUSTOM_ERROR - 1000)
static const uint8_t BLOCKING = 1; static const uint8_t BLOCKING = 1;
typedef struct _GstSvtJpegXsDec typedef struct _GstSvtJpegXsDec
@ -504,6 +506,7 @@ gst_svt_jpeg_xs_dec_decode_codestream (GstSvtJpegXsDec * jxsdec,
goto get_frame_error; goto get_frame_error;
} }
GST_TRACE_OBJECT (jxsdec, "Decoding finished OK");
return GST_FLOW_OK; return GST_FLOW_OK;
send_packet_error: send_packet_error:
@ -517,9 +520,14 @@ get_frame_error:
{ {
GstFlowReturn flow = GST_FLOW_ERROR; GstFlowReturn flow = GST_FLOW_ERROR;
GST_TRACE_OBJECT (jxsdec, "Decoding error 0x%08x", dec_ret);
GST_VIDEO_DECODER_ERROR (jxsdec, 1, STREAM, DECODE, GST_VIDEO_DECODER_ERROR (jxsdec, 1, STREAM, DECODE,
(NULL), ("Error decoding image, error code 0x%08x", dec_ret), flow); (NULL), ("Error decoding image, error code 0x%08x", dec_ret), flow);
if (flow == GST_FLOW_OK)
flow = GST_JPEG_XS_DEC_FLOW_DROP_FRAME;
return flow; return flow;
} }
} }
@ -576,8 +584,12 @@ gst_svt_jpeg_xs_dec_handle_frame (GstVideoDecoder * vdecoder,
in_map.memory = NULL; in_map.memory = NULL;
} }
// And output! // And output! (or drop)
flow = gst_video_decoder_finish_frame (vdecoder, frame); if (flow == GST_FLOW_OK) {
flow = gst_video_decoder_finish_frame (vdecoder, frame);
} else {
flow = gst_video_decoder_drop_frame (vdecoder, frame);
}
frame = NULL; frame = NULL;