mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-06 14:45:54 +00:00
GST_FLOW_UNEXPECTED -> GST_FLOW_EOS
This commit is contained in:
parent
f017f9a913
commit
b592f431e3
|
@ -649,7 +649,7 @@ gst_faad_parse (GstAudioDecoder * dec, GstAdapter * adapter,
|
||||||
ret = gst_faad_sync (faad, data, size, !eos, offset, length);
|
ret = gst_faad_sync (faad, data, size, !eos, offset, length);
|
||||||
gst_adapter_unmap (adapter);
|
gst_adapter_unmap (adapter);
|
||||||
|
|
||||||
return (ret ? GST_FLOW_OK : GST_FLOW_UNEXPECTED);
|
return (ret ? GST_FLOW_OK : GST_FLOW_EOS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -349,7 +349,7 @@ eos:
|
||||||
GST_DEBUG_OBJECT (mmssrc, "EOS");
|
GST_DEBUG_OBJECT (mmssrc, "EOS");
|
||||||
g_free (data);
|
g_free (data);
|
||||||
*buf = NULL;
|
*buf = NULL;
|
||||||
return GST_FLOW_UNEXPECTED;
|
return GST_FLOW_EOS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -777,7 +777,7 @@ gst_base_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
|
||||||
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
|
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
|
||||||
|
|
||||||
if (base_video_encoder->at_eos) {
|
if (base_video_encoder->at_eos) {
|
||||||
ret = GST_FLOW_UNEXPECTED;
|
ret = GST_FLOW_EOS;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -226,7 +226,7 @@ gst_data_uri_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
|
||||||
/* This is only correct because GstBaseSrc already clips size for us to be no
|
/* This is only correct because GstBaseSrc already clips size for us to be no
|
||||||
* larger than the max. available size if a segment at the end is requested */
|
* larger than the max. available size if a segment at the end is requested */
|
||||||
if (offset + size > gst_buffer_get_size (src->buffer)) {
|
if (offset + size > gst_buffer_get_size (src->buffer)) {
|
||||||
ret = GST_FLOW_UNEXPECTED;
|
ret = GST_FLOW_EOS;
|
||||||
} else {
|
} else {
|
||||||
ret = GST_FLOW_OK;
|
ret = GST_FLOW_OK;
|
||||||
*buf =
|
*buf =
|
||||||
|
|
|
@ -1441,9 +1441,9 @@ error:
|
||||||
const gchar *reason = gst_flow_get_name (ret);
|
const gchar *reason = gst_flow_get_name (ret);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (base, "Pausing task, reason %s", reason);
|
GST_DEBUG_OBJECT (base, "Pausing task, reason %s", reason);
|
||||||
if (ret == GST_FLOW_UNEXPECTED)
|
if (ret == GST_FLOW_EOS)
|
||||||
GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, gst_event_new_eos ());
|
GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, gst_event_new_eos ());
|
||||||
else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
|
else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
|
||||||
GST_ELEMENT_ERROR (base, STREAM, FAILED,
|
GST_ELEMENT_ERROR (base, STREAM, FAILED,
|
||||||
(_("Internal data stream error.")),
|
(_("Internal data stream error.")),
|
||||||
("stream stopped, reason %s", reason));
|
("stream stopped, reason %s", reason));
|
||||||
|
|
|
@ -704,7 +704,7 @@ gst_ts_demux_perform_seek (MpegTSBase * base, GstSegment * segment, guint16 pid)
|
||||||
res =
|
res =
|
||||||
find_pcr_packet (&demux->parent, seekpos, 4000 * MPEGTS_MAX_PACKETSIZE,
|
find_pcr_packet (&demux->parent, seekpos, 4000 * MPEGTS_MAX_PACKETSIZE,
|
||||||
&seekpcroffset);
|
&seekpcroffset);
|
||||||
if (G_UNLIKELY (res == GST_FLOW_UNEXPECTED)) {
|
if (G_UNLIKELY (res == GST_FLOW_EOS)) {
|
||||||
seekpos =
|
seekpos =
|
||||||
MAX ((gint64) pcr_start.offset,
|
MAX ((gint64) pcr_start.offset,
|
||||||
seekpos - 2000 * MPEGTS_MAX_PACKETSIZE) + 188;
|
seekpos - 2000 * MPEGTS_MAX_PACKETSIZE) + 188;
|
||||||
|
@ -1596,7 +1596,7 @@ find_timestamps (MpegTSBase * base, guint64 initoff, guint64 * offset)
|
||||||
/* Search for the first PCRs */
|
/* Search for the first PCRs */
|
||||||
ret = process_pcr (base, base->first_pat_offset, &initial, 10, TRUE);
|
ret = process_pcr (base, base->first_pat_offset, &initial, 10, TRUE);
|
||||||
|
|
||||||
if (ret != GST_FLOW_OK && ret != GST_FLOW_UNEXPECTED) {
|
if (ret != GST_FLOW_OK && ret != GST_FLOW_EOS) {
|
||||||
GST_WARNING ("Problem getting initial PCRs");
|
GST_WARNING ("Problem getting initial PCRs");
|
||||||
goto beach;
|
goto beach;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue