mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
codecs: Use GST_VIDEO_DECODER_ERROR() only for decoding error case
The GST_VIDEO_DECODER_ERROR() should be used only for robust/error-resilient decoding purpose. Any other error codes such as not-negotiated or flushing should be returned without modified for upstream to be able to handle it immediately. (for example, application might want to try other decoder element on not-negotiated) Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1070>
This commit is contained in:
parent
e31b797c05
commit
88437a9c9b
6 changed files with 33 additions and 23 deletions
|
@ -647,13 +647,11 @@ out:
|
||||||
priv->current_picture = NULL;
|
priv->current_picture = NULL;
|
||||||
priv->current_frame = NULL;
|
priv->current_frame = NULL;
|
||||||
|
|
||||||
if (ret != GST_FLOW_OK) {
|
if (ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (decoder, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (decoder, 1, STREAM, DECODE,
|
||||||
("Failed to handle the frame %d", frame->system_frame_number),
|
("Failed to handle the frame %d", frame->system_frame_number),
|
||||||
NULL, ret);
|
NULL, ret);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return GST_FLOW_OK;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -563,10 +563,12 @@ gst_h264_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
gst_buffer_unmap (in_buf, &map);
|
gst_buffer_unmap (in_buf, &map);
|
||||||
|
|
||||||
if (decode_ret != GST_FLOW_OK) {
|
if (decode_ret != GST_FLOW_OK) {
|
||||||
|
if (decode_ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), decode_ret);
|
("Failed to decode data"), (NULL), decode_ret);
|
||||||
gst_video_decoder_drop_frame (decoder, frame);
|
}
|
||||||
|
|
||||||
|
gst_video_decoder_drop_frame (decoder, frame);
|
||||||
gst_h264_picture_clear (&priv->current_picture);
|
gst_h264_picture_clear (&priv->current_picture);
|
||||||
priv->current_frame = NULL;
|
priv->current_frame = NULL;
|
||||||
|
|
||||||
|
@ -577,7 +579,7 @@ gst_h264_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
gst_video_codec_frame_unref (frame);
|
gst_video_codec_frame_unref (frame);
|
||||||
priv->current_frame = NULL;
|
priv->current_frame = NULL;
|
||||||
|
|
||||||
if (decode_ret != GST_FLOW_OK) {
|
if (decode_ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), decode_ret);
|
("Failed to decode data"), (NULL), decode_ret);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1804,10 +1804,12 @@ gst_h265_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
priv->current_frame = NULL;
|
priv->current_frame = NULL;
|
||||||
|
|
||||||
if (decode_ret != GST_FLOW_OK) {
|
if (decode_ret != GST_FLOW_OK) {
|
||||||
|
if (decode_ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), decode_ret);
|
("Failed to decode data"), (NULL), decode_ret);
|
||||||
gst_video_decoder_drop_frame (decoder, frame);
|
}
|
||||||
|
|
||||||
|
gst_video_decoder_drop_frame (decoder, frame);
|
||||||
gst_h265_picture_clear (&priv->current_picture);
|
gst_h265_picture_clear (&priv->current_picture);
|
||||||
|
|
||||||
return decode_ret;
|
return decode_ret;
|
||||||
|
@ -1821,7 +1823,7 @@ gst_h265_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
gst_video_decoder_release_frame (decoder, frame);
|
gst_video_decoder_release_frame (decoder, frame);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decode_ret != GST_FLOW_OK) {
|
if (decode_ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), decode_ret);
|
("Failed to decode data"), (NULL), decode_ret);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1184,13 +1184,17 @@ gst_mpeg2_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
|
|
||||||
failed:
|
failed:
|
||||||
{
|
{
|
||||||
|
if (ret == GST_FLOW_ERROR) {
|
||||||
GST_VIDEO_DECODER_ERROR (decoder, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (decoder, 1, STREAM, DECODE,
|
||||||
("failed to handle the frame %d", frame->system_frame_number), (NULL),
|
("failed to handle the frame %d", frame->system_frame_number), (NULL),
|
||||||
ret);
|
ret);
|
||||||
|
}
|
||||||
|
|
||||||
gst_video_decoder_drop_frame (decoder, frame);
|
gst_video_decoder_drop_frame (decoder, frame);
|
||||||
gst_mpeg2_picture_clear (&priv->current_picture);
|
gst_mpeg2_picture_clear (&priv->current_picture);
|
||||||
gst_mpeg2_picture_clear (&priv->first_field);
|
gst_mpeg2_picture_clear (&priv->first_field);
|
||||||
priv->current_frame = NULL;
|
priv->current_frame = NULL;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -362,6 +362,7 @@ gst_vp8_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
|
|
||||||
if (!gst_buffer_map (in_buf, &map, GST_MAP_READ)) {
|
if (!gst_buffer_map (in_buf, &map, GST_MAP_READ)) {
|
||||||
GST_ERROR_OBJECT (self, "Cannot map buffer");
|
GST_ERROR_OBJECT (self, "Cannot map buffer");
|
||||||
|
ret = GST_FLOW_ERROR;
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -370,6 +371,7 @@ gst_vp8_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
|
|
||||||
if (pres != GST_VP8_PARSER_OK) {
|
if (pres != GST_VP8_PARSER_OK) {
|
||||||
GST_ERROR_OBJECT (self, "Cannot parser frame header");
|
GST_ERROR_OBJECT (self, "Cannot parser frame header");
|
||||||
|
ret = GST_FLOW_ERROR;
|
||||||
goto unmap_and_error;
|
goto unmap_and_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -473,12 +475,12 @@ error:
|
||||||
if (picture)
|
if (picture)
|
||||||
gst_vp8_picture_unref (picture);
|
gst_vp8_picture_unref (picture);
|
||||||
|
|
||||||
if (ret == GST_FLOW_OK)
|
if (ret == GST_FLOW_ERROR) {
|
||||||
ret = GST_FLOW_ERROR;
|
|
||||||
|
|
||||||
gst_video_decoder_drop_frame (decoder, frame);
|
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), ret);
|
("Failed to decode data"), (NULL), ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
gst_video_decoder_drop_frame (decoder, frame);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -335,6 +335,7 @@ gst_vp9_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
|
|
||||||
if (!gst_buffer_map (in_buf, &map, GST_MAP_READ)) {
|
if (!gst_buffer_map (in_buf, &map, GST_MAP_READ)) {
|
||||||
GST_ERROR_OBJECT (self, "Cannot map input buffer");
|
GST_ERROR_OBJECT (self, "Cannot map input buffer");
|
||||||
|
ret = GST_FLOW_ERROR;
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -343,6 +344,7 @@ gst_vp9_decoder_handle_frame (GstVideoDecoder * decoder,
|
||||||
|
|
||||||
if (pres != GST_VP9_PARSER_OK) {
|
if (pres != GST_VP9_PARSER_OK) {
|
||||||
GST_ERROR_OBJECT (self, "Failed to parsing frame header");
|
GST_ERROR_OBJECT (self, "Failed to parsing frame header");
|
||||||
|
ret = GST_FLOW_ERROR;
|
||||||
goto unmap_and_error;
|
goto unmap_and_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -498,12 +500,12 @@ error:
|
||||||
if (picture)
|
if (picture)
|
||||||
gst_vp9_picture_unref (picture);
|
gst_vp9_picture_unref (picture);
|
||||||
|
|
||||||
if (ret == GST_FLOW_OK)
|
if (ret == GST_FLOW_ERROR) {
|
||||||
ret = GST_FLOW_ERROR;
|
|
||||||
|
|
||||||
gst_video_decoder_drop_frame (decoder, frame);
|
|
||||||
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
GST_VIDEO_DECODER_ERROR (self, 1, STREAM, DECODE,
|
||||||
("Failed to decode data"), (NULL), ret);
|
("Failed to decode data"), (NULL), ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
gst_video_decoder_drop_frame (decoder, frame);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue