mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegpay: turn some errors into warnings

Browse source 
Turn some errors into warnings, we can continue processing so this should
not be fatal.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=657079
This commit is contained in:
Wim Taymans 2013-06-26 20:49:41 +02:00
parent bb9d42b976
commit 4258ddcc36
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/rtp/gstrtpjpegpay.c
View file

@ -57,8 +57,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
" payload = (int) 26 , " " payload = (int) 26 , "
" clock-rate = (int) 90000, " " clock-rate = (int) 90000, "
" encoding-name = (string) \"JPEG\", " " encoding-name = (string) \"JPEG\", "
" width = (int) [ 1, 65536 ], " " width = (int) [ 1, 65536 ], " " height = (int) [ 1, 65536 ]")
" height = (int) [ 1, 65536 ]")
); );
GST_DEBUG_CATEGORY_STATIC (rtpjpegpay_debug); GST_DEBUG_CATEGORY_STATIC (rtpjpegpay_debug);
@ -326,14 +325,13 @@ gst_rtp_jpeg_pay_setcaps (GstRTPBasePayload * basepayload, GstCaps * caps)
gst_rtp_base_payload_set_options (basepayload, "video", TRUE, "JPEG", 90000); gst_rtp_base_payload_set_options (basepayload, "video", TRUE, "JPEG", 90000);
if (num > 0) if (num > 0) {
{
gdouble framerate; gdouble framerate;
gst_util_fraction_to_double (num, denom, &framerate); gst_util_fraction_to_double (num, denom, &framerate);
rate = g_strdup_printf("%f", framerate); rate = g_strdup_printf ("%f", framerate);
} }
size = g_strdup_printf("%d-%d", width, height); size = g_strdup_printf ("%d-%d", width, height);
if (pay->width == 0) { if (pay->width == 0) {
GST_DEBUG_OBJECT (pay, GST_DEBUG_OBJECT (pay,
@ -573,37 +571,37 @@ gst_rtp_jpeg_pay_read_sof (GstRtpJPEGPay * pay, const guint8 * data,
/* ERRORS */ /* ERRORS */
wrong_size: wrong_size:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, GST_ELEMENT_WARNING (pay, STREAM, FORMAT,
("Wrong size %u (needed %u).", size, off + 17), (NULL)); ("Wrong size %u (needed %u).", size, off + 17), (NULL));
return FALSE; return FALSE;
} }
wrong_length: wrong_length:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, GST_ELEMENT_WARNING (pay, STREAM, FORMAT,
("Wrong SOF length %u.", sof_size), (NULL)); ("Wrong SOF length %u.", sof_size), (NULL));
return FALSE; return FALSE;
} }
bad_precision: bad_precision:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, GST_ELEMENT_WARNING (pay, STREAM, FORMAT,
("Wrong precision, expecting 8."), (NULL)); ("Wrong precision, expecting 8."), (NULL));
return FALSE; return FALSE;
} }
invalid_dimension: invalid_dimension:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, GST_ELEMENT_WARNING (pay, STREAM, FORMAT,
("Wrong dimension, size %ux%u", width, height), (NULL)); ("Wrong dimension, size %ux%u", width, height), (NULL));
return FALSE; return FALSE;
} }
bad_components: bad_components:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, GST_ELEMENT_WARNING (pay, STREAM, FORMAT,
("Wrong number of components"), (NULL)); ("Wrong number of components"), (NULL));
return FALSE; return FALSE;
} }
invalid_comp: invalid_comp:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, ("Invalid component"), (NULL)); GST_ELEMENT_WARNING (pay, STREAM, FORMAT, ("Invalid component"), (NULL));
return FALSE; return FALSE;
} }
} }
@ -908,31 +906,31 @@ gst_rtp_jpeg_pay_handle_buffer (GstRTPBasePayload * basepayload,
/* ERRORS */ /* ERRORS */
unsupported_jpeg: unsupported_jpeg:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, ("Unsupported JPEG"), (NULL)); GST_ELEMENT_WARNING (pay, STREAM, FORMAT, ("Unsupported JPEG"), (NULL));
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return GST_FLOW_NOT_SUPPORTED; return GST_FLOW_OK;
} }
no_dimension: no_dimension:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, ("No size given"), (NULL)); GST_ELEMENT_WARNING (pay, STREAM, FORMAT, ("No size given"), (NULL));
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_OK;
} }
invalid_format: invalid_format:
{ {
/* error was posted */ /* error was posted */
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return GST_FLOW_ERROR; return GST_FLOW_OK;
} }
invalid_quant: invalid_quant:
{ {
GST_ELEMENT_ERROR (pay, STREAM, FORMAT, ("Invalid quant tables"), (NULL)); GST_ELEMENT_WARNING (pay, STREAM, FORMAT, ("Invalid quant tables"), (NULL));
gst_buffer_unmap (buffer, &map); gst_buffer_unmap (buffer, &map);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return GST_FLOW_ERROR; return GST_FLOW_OK;
} }
} }