diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-27 18:19:00 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-04 14:57:51 +0200 |
| commit | 704b371944af64e53c96539f84195dfdfe32b873 (patch) | |
| tree | 90f034692c4fedfad56f03ccd692358ee135167a | |
| parent | 080b3673a952c68eea5defc8eb686b4b05f002b9 (diff) | |
asfdemux: Don't use GST_FLOW_IS_FATAL()
And don't post error messages for UNEXPECTED and post an error
message if pulling data failed because of NOT_LINKED.
| -rw-r--r-- | gst/asfdemux/gstasfdemux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index cff9f36f..88bff47b 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -385,7 +385,7 @@ gst_asf_demux_sink_event (GstPad * pad, GstEvent * event) break; } flow = gst_asf_demux_push_complete_payloads (demux, TRUE); - if (GST_FLOW_IS_FATAL (flow) || flow == GST_FLOW_NOT_LINKED) { + if (flow < GST_FLOW_UNEXPECTED || flow == GST_FLOW_NOT_LINKED) { GST_ELEMENT_ERROR (demux, STREAM, FAILED, (_("Internal data stream error.")), ("streaming stopped, reason %s", gst_flow_get_name (flow))); @@ -1522,7 +1522,7 @@ gst_asf_demux_loop (GstASFDemux * demux) GST_DEBUG_OBJECT (demux, "got flow %s", gst_flow_get_name (flow)); if (flow == GST_FLOW_UNEXPECTED) goto eos; - else if (!GST_FLOW_IS_FATAL (flow)) { + else if (flow == GST_FLOW_WRONG_STATE) { GST_DEBUG_OBJECT (demux, "Not fatal"); goto pause; } else @@ -2289,7 +2289,7 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data, flags = gst_asf_demux_get_uint16 (&data, &size); stream_id = flags & 0x7f; - is_encrypted = !!((flags & 0x8000) << 15); + is_encrypted = ! !((flags & 0x8000) << 15); unknown = gst_asf_demux_get_uint32 (&data, &size); GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT, @@ -2895,8 +2895,8 @@ gst_asf_demux_process_file (GstASFDemux * demux, guint8 * data, guint64 size) max_pktsize = gst_asf_demux_get_uint32 (&data, &size); min_bitrate = gst_asf_demux_get_uint32 (&data, &size); - demux->broadcast = !!(flags & 0x01); - demux->seekable = !!(flags & 0x02); + demux->broadcast = ! !(flags & 0x01); + demux->seekable = ! !(flags & 0x02); GST_DEBUG_OBJECT (demux, "min_pktsize = %u", min_pktsize); GST_DEBUG_OBJECT (demux, "flags::broadcast = %d", demux->broadcast); |