diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-01-29 23:20:45 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-01-29 23:20:45 +0000 |
commit | 51e5863a97bdfc80b5c2024236f990210f4541f8 (patch) | |
tree | a405601ca4a288858cdb43a438f31d5e5969674b /gst | |
parent | 9925c8d04217e7e41993ee98fe77ddd02eb857a1 (diff) |
GST_ELEMENT_ERROR
Original commit message from CVS:
GST_ELEMENT_ERROR
Diffstat (limited to 'gst')
-rw-r--r-- | gst/avi/gstavidemux.c | 10 | ||||
-rw-r--r-- | gst/avi/gstavimux.c | 2 | ||||
-rw-r--r-- | gst/flx/gstflxdec.c | 2 | ||||
-rw-r--r-- | gst/goom/gstgoom.c | 2 | ||||
-rw-r--r-- | gst/matroska/ebml-read.c | 28 | ||||
-rw-r--r-- | gst/matroska/matroska-demux.c | 10 | ||||
-rw-r--r-- | gst/monoscope/gstmonoscope.c | 2 | ||||
-rw-r--r-- | gst/smpte/gstsmpte.c | 2 | ||||
-rw-r--r-- | gst/wavenc/gstwavenc.c | 2 | ||||
-rw-r--r-- | gst/wavparse/gstwavparse.c | 6 |
10 files changed, 33 insertions, 33 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 6cd3e848..16540d6c 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -687,7 +687,7 @@ gst_avi_demux_stream_init (GstAviDemux *avi) if (!gst_riff_read_header (riff, &doctype)) return FALSE; if (doctype != GST_RIFF_RIFF_AVI) { - gst_element_error (avi, STREAM, WRONG_TYPE, NULL, NULL); + GST_ELEMENT_ERROR (avi, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } @@ -802,7 +802,7 @@ gst_avi_demux_add_stream (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_strf) { - gst_element_error (avi, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (avi, STREAM, DEMUX, NULL, ("Invalid AVI header (no strf as second tag)")); goto skip_stream; } @@ -1157,7 +1157,7 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_LIST) { - gst_element_error (avi, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (avi, STREAM, DEMUX, NULL, ("Invalid AVI header (no LIST at start): " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; @@ -1165,7 +1165,7 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!gst_riff_read_list (riff, &tag)) return FALSE; if (tag != GST_RIFF_LIST_hdrl) { - gst_element_error (avi, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (avi, STREAM, DEMUX, NULL, ("Invalid AVI header (no hdrl at start): " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; @@ -1175,7 +1175,7 @@ gst_avi_demux_stream_header (GstAviDemux *avi) if (!(tag = gst_riff_peek_tag (riff, NULL))) return FALSE; if (tag != GST_RIFF_TAG_avih) { - gst_element_error (avi, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (avi, STREAM, DEMUX, NULL, ("Invalid AVI header (no avih at start): " GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag))); return FALSE; diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index bac74d14..f27892b3 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -985,7 +985,7 @@ gst_avimux_stop_file (GstAviMux *avimux) if (avimux->audio_time) { avimux->auds_hdr.rate = (GST_SECOND * avimux->audio_size) / avimux->audio_time; } else { - gst_element_error (avimux, STREAM, MUX, + GST_ELEMENT_ERROR (avimux, STREAM, MUX, (_("No or invalid input audio, AVI stream will be corrupt")), NULL); avimux->auds_hdr.rate = 0; } diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index c861a1f4..a88b1a74 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -463,7 +463,7 @@ gst_flxdec_loop (GstElement *element) if (flxh->type != FLX_MAGICHDR_FLI && flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLX) { - gst_element_error (element, STREAM, WRONG_TYPE, NULL, ("not a flx file (type %d)\n", flxh->type)); + GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, NULL, ("not a flx file (type %d)\n", flxh->type)); return; } diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 6fe574bb..27ae0109 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -299,7 +299,7 @@ gst_goom_chain (GstPad *pad, GstData *_data) } if (goom->channels == 0) { - gst_element_error (goom, CORE, NEGOTIATION, NULL, + GST_ELEMENT_ERROR (goom, CORE, NEGOTIATION, NULL, ("format wasn't negotiated before chain function")); goto done; diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index 8ecb4adb..4f813f65 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -167,7 +167,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, } else { guint64 pos = gst_bytestream_tell (ebml->bs); gst_event_unref (event); - gst_element_error (ebml, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); } @@ -180,7 +180,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, } if (read > 4) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL, ("Invalid EBML ID size tag (0x%x) at position %llu (0x%llx)", data[0], pos, pos)); return -1; @@ -188,7 +188,7 @@ gst_ebml_read_element_id (GstEbmlRead *ebml, if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } @@ -219,7 +219,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, if (gst_bytestream_peek_bytes (ebml->bs, &data, 1) != 1) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } @@ -230,7 +230,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, } if (read > 8) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL, ("Invalid EBML length size tag (0x%x) at position %llu (0x%llx)", data[0], pos, pos)); return -1; @@ -240,7 +240,7 @@ gst_ebml_read_element_length (GstEbmlRead *ebml, num_ffs++; if (gst_bytestream_peek_bytes (ebml->bs, &data, read) != read) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); return -1; } @@ -272,7 +272,7 @@ gst_ebml_read_element_data (GstEbmlRead *ebml, if (gst_bytestream_peek (ebml->bs, &buf, length) != length) { guint64 pos = gst_bytestream_tell (ebml->bs); - gst_element_error (ebml, RESOURCE, READ, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, READ, NULL, ("Read error at position %llu (0x%llx)", pos, pos)); if (buf) gst_buffer_unref (buf); @@ -327,7 +327,7 @@ gst_ebml_read_seek (GstEbmlRead *ebml, /* now seek */ if (!gst_bytestream_seek (ebml->bs, offset, GST_SEEK_METHOD_SET)) { - gst_element_error (ebml, RESOURCE, SEEK, NULL, + GST_ELEMENT_ERROR (ebml, RESOURCE, SEEK, NULL, ("Seek to position %llu (0x%llx) failed", offset, offset)); return NULL; } @@ -340,7 +340,7 @@ gst_ebml_read_seek (GstEbmlRead *ebml, /* get the discont event and return */ gst_bytestream_get_status (ebml->bs, &remaining, &event); if (!event || GST_EVENT_TYPE (event) != GST_EVENT_DISCONTINUOUS) { - gst_element_error (ebml, CORE, SEEK, NULL, + GST_ELEMENT_ERROR (ebml, CORE, SEEK, NULL, ("No discontinuity event after seek")); if (event) gst_event_unref (event); @@ -431,7 +431,7 @@ gst_ebml_read_uint (GstEbmlRead *ebml, data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); if (size < 1 || size > 8) { - gst_element_error (ebml, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL, ("Invalid integer element size %d at position %llu (0x%llu)", size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); @@ -467,7 +467,7 @@ gst_ebml_read_sint (GstEbmlRead *ebml, data = GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); if (size < 1 || size > 8) { - gst_element_error (ebml, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL, ("Invalid integer element size %d at position %llu (0x%llx)", size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); @@ -512,7 +512,7 @@ gst_ebml_read_float (GstEbmlRead *ebml, size = GST_BUFFER_SIZE (buf); if (size != 4 && size != 8 && size != 10) { - gst_element_error (ebml, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (ebml, STREAM, DEMUX, NULL, ("Invalid float element size %d at position %llu (0x%llx)", size, GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET (buf))); gst_buffer_unref (buf); @@ -520,7 +520,7 @@ gst_ebml_read_float (GstEbmlRead *ebml, } if (size == 10) { - gst_element_error (ebml, CORE, NOT_IMPLEMENTED, NULL, + GST_ELEMENT_ERROR (ebml, CORE, NOT_IMPLEMENTED, NULL, ("FIXME! 10-byte floats unimplemented")); gst_buffer_unref (buf); return FALSE; @@ -681,7 +681,7 @@ gst_ebml_read_header (GstEbmlRead *ebml, if (!(id = gst_ebml_peek_id (ebml, &level_up))) return FALSE; if (level_up != 0 || id != GST_EBML_ID_HEADER) { - gst_element_error (ebml, STREAM, WRONG_TYPE, NULL, NULL); + GST_ELEMENT_ERROR (ebml, STREAM, WRONG_TYPE, NULL, NULL); return FALSE; } if (!gst_ebml_read_master (ebml, &id)) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 2f819acc..c905d775 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1130,7 +1130,7 @@ gst_matroska_demux_init_stream (GstMatroskaDemux *demux) return FALSE; if (!doctype || strcmp (doctype, "matroska") != 0) { - gst_element_error (demux, STREAM, WRONG_TYPE, NULL, + GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, NULL, ("Input is not a matroska stream (doctype=%s)", doctype ? doctype : "none")); g_free (doctype); @@ -1138,7 +1138,7 @@ gst_matroska_demux_init_stream (GstMatroskaDemux *demux) } g_free (doctype); if (version > 1) { - gst_element_error (demux, STREAM, DEMUX, NULL, + GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Demuxer version (1) is too old to read stream version %d", version)); return FALSE; @@ -1634,7 +1634,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, /* first byte(s): blocknum */ if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) { - gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); + GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error")); gst_buffer_unref (buf); res = FALSE; break; @@ -1705,7 +1705,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, case 0x3: /* EBML lacing */ { guint total; if ((n = gst_matroska_ebmlnum_uint (data, size, &num)) < 0) { - gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); + GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error")); res = FALSE; break; } @@ -1715,7 +1715,7 @@ gst_matroska_demux_parse_blockgroup (GstMatroskaDemux *demux, gint64 snum; gint r; if ((r = gst_matroska_ebmlnum_sint (data, size, &snum)) < 0) { - gst_element_error (demux, STREAM, DEMUX, NULL, ("Data error")); + GST_ELEMENT_ERROR (demux, STREAM, DEMUX, NULL, ("Data error")); res = FALSE; break; } diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index fa85814c..0d7212cb 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -230,7 +230,7 @@ gst_monoscope_chain (GstPad *pad, GstData *_data) GST_DEBUG ("making new pad"); if (!gst_pad_is_negotiated (monoscope->srcpad)) { if (gst_pad_renegotiate (monoscope->srcpad) <= 0) { - gst_element_error (monoscope, CORE, NEGOTIATION, NULL, NULL); + GST_ELEMENT_ERROR (monoscope, CORE, NEGOTIATION, NULL, NULL); return; } } diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index 5cfbcc0b..9aef470c 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -371,7 +371,7 @@ gst_smpte_loop (GstElement *element) "framerate", G_TYPE_DOUBLE, smpte->fps, NULL); if (!gst_pad_try_set_caps (smpte->srcpad, caps)) { - gst_element_error (smpte, CORE, NEGOTIATION, NULL, NULL); + GST_ELEMENT_ERROR (smpte, CORE, NEGOTIATION, NULL, NULL); return; } } diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index c5381c62..4c156e2a 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -588,7 +588,7 @@ gst_wavenc_chain (GstPad *pad, if (!wavenc->setup) { gst_buffer_unref (buf); - gst_element_error (wavenc, CORE, NEGOTIATION, NULL, ("encoder not initialised (input is not audio?)")); + GST_ELEMENT_ERROR (wavenc, CORE, NEGOTIATION, NULL, ("encoder not initialised (input is not audio?)")); return; } diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index e37cbf3c..ec991bdc 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -636,7 +636,7 @@ gst_wavparse_parse_fmt (GstWavParse *wavparse, guint size) break; default: - gst_element_error (wavparse, STREAM, NOT_IMPLEMENTED, NULL, ("format %d not handled", wavparse->format)); + GST_ELEMENT_ERROR (wavparse, STREAM, NOT_IMPLEMENTED, NULL, ("format %d not handled", wavparse->format)); return; } @@ -731,7 +731,7 @@ gst_wavparse_loop (GstElement *element) if (event && GST_EVENT_TYPE (event) == GST_EVENT_EOS) { gst_pad_event_default (wavparse->sinkpad, event); } else { - gst_element_error (element, RESOURCE, READ, NULL, NULL); + GST_ELEMENT_ERROR (element, RESOURCE, READ, NULL, NULL); } return; } @@ -808,7 +808,7 @@ gst_wavparse_loop (GstElement *element) case GST_WAVPARSE_START: if (chunk.id != GST_RIFF_TAG_RIFF && chunk.type != GST_RIFF_RIFF_WAVE) { - gst_element_error (element, STREAM, WRONG_TYPE, NULL, + GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, NULL, ("chunk.id %08x chunk.type %08x", chunk.id, chunk.type)); return; } |