FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

jpegparse: don't trigger message for failed com marker

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5838>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-12-19 13:16:34 +01:00
parent 497890f678
commit 658b5b4399
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
subprojects/gst-plugins-bad/gst/jpegformat/gstjpegparse.c
View File

@ -641,8 +641,13 @@ get_utf8_from_data (const guint8 * data, guint16 size)
"GST_TAG_ENCODING", NULL "GST_TAG_ENCODING", NULL
}; };
const char *str = (gchar *) data; const char *str = (gchar *) data;
char *ret;
return gst_tag_freeform_string_to_utf8 (str, size, env_vars); ret = gst_tag_freeform_string_to_utf8 (str, size, env_vars);
if (!ret)
GST_MEMDUMP ("non-parsed marker data", data, size);
return ret;
} }
/* read comment and post as tag */ /* read comment and post as tag */
@ -905,10 +910,8 @@ gst_jpeg_parse_handle_frame (GstBaseParse * bparse, GstBaseParseFrame * frame,
parse->state |= GST_JPEG_PARSER_STATE_GOT_SOS; parse->state |= GST_JPEG_PARSER_STATE_GOT_SOS;
break; break;
case GST_JPEG_MARKER_COM: case GST_JPEG_MARKER_COM:
if (!gst_jpeg_parse_com (parse, &seg)) { if (!gst_jpeg_parse_com (parse, &seg))
GST_ELEMENT_WARNING (parse, STREAM, FORMAT, GST_WARNING_OBJECT (parse, "Failed to parse com segment");
("Invalid data"), ("Failed to parse com segment"));
}
break; break;
case GST_JPEG_MARKER_APP0: case GST_JPEG_MARKER_APP0:
if (!gst_jpeg_parse_app0 (parse, &seg)) { if (!gst_jpeg_parse_app0 (parse, &seg)) {