mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-29 07:12:36 +00:00
jpegparse: fix warning text and debug data
They were backwards or missing. Fix: #2567 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4641>
This commit is contained in:
parent
a1f0727186
commit
ad40a9323e
1 changed files with 5 additions and 5 deletions
|
@ -796,25 +796,25 @@ gst_jpeg_parse_handle_frame (GstBaseParse * bparse, GstBaseParseFrame * frame,
|
||||||
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_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
||||||
("Failed to parse com segment"), ("Invalid data"));
|
("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)) {
|
||||||
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
||||||
("Failed to parse app0 segment"), ("Invalid data"));
|
("Invalid data"), ("Failed to parse app0 segment"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GST_JPEG_MARKER_APP1:
|
case GST_JPEG_MARKER_APP1:
|
||||||
if (!gst_jpeg_parse_app1 (parse, &seg)) {
|
if (!gst_jpeg_parse_app1 (parse, &seg)) {
|
||||||
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
||||||
("Failed to parse app1 segment"), ("Invalid data"));
|
("Invalid data"), ("Failed to parse app1 segment"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GST_JPEG_MARKER_APP14:
|
case GST_JPEG_MARKER_APP14:
|
||||||
if (!gst_jpeg_parse_app14 (parse, &seg)) {
|
if (!gst_jpeg_parse_app14 (parse, &seg)) {
|
||||||
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
GST_ELEMENT_WARNING (parse, STREAM, FORMAT,
|
||||||
("Failed to parse app14 segment"), ("Invalid data"));
|
("Invalid data"), ("Failed to parse app14 segment"));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GST_JPEG_MARKER_DHT:
|
case GST_JPEG_MARKER_DHT:
|
||||||
|
@ -831,7 +831,7 @@ gst_jpeg_parse_handle_frame (GstBaseParse * bparse, GstBaseParseFrame * frame,
|
||||||
parse->sof = marker - 0xc0;
|
parse->sof = marker - 0xc0;
|
||||||
} else {
|
} else {
|
||||||
GST_ELEMENT_ERROR (parse, STREAM, FORMAT,
|
GST_ELEMENT_ERROR (parse, STREAM, FORMAT,
|
||||||
("Duplicated or bad SOF marker"), (NULL));
|
("Invalid data"), ("Duplicated or bad SOF marker"));
|
||||||
gst_buffer_unmap (frame->buffer, &mapinfo);
|
gst_buffer_unmap (frame->buffer, &mapinfo);
|
||||||
gst_jpeg_parse_reset (parse);
|
gst_jpeg_parse_reset (parse);
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
|
|
Loading…
Reference in a new issue