mssdemux: replace unused parameter

The buffer parameter wasn't being used, it was only to signal if
a buffer was downloaded and advance to the next fragment in the
manifest.

Replace the buffer with a boolean that has the same effect and is
safer
This commit is contained in:
Thiago Santos 2013-04-12 15:55:23 -03:00
parent 6d56eba653
commit e541ec7e63

View file

@ -994,7 +994,7 @@ gst_mss_demux_stream_store_object (GstMssDemuxStream * stream,
static GstFlowReturn static GstFlowReturn
gst_mss_demux_stream_download_fragment (GstMssDemuxStream * stream, gst_mss_demux_stream_download_fragment (GstMssDemuxStream * stream,
GstBuffer ** buffer) gboolean * buffer_downloaded)
{ {
GstMssDemux *mssdemux = stream->parent; GstMssDemux *mssdemux = stream->parent;
gchar *path; gchar *path;
@ -1056,8 +1056,8 @@ gst_mss_demux_stream_download_fragment (GstMssDemuxStream * stream,
g_object_unref (fragment); g_object_unref (fragment);
if (buffer) if (buffer_downloaded)
*buffer = _buffer; *buffer_downloaded = _buffer != NULL;
after_download = g_get_real_time (); after_download = g_get_real_time ();
if (_buffer) { if (_buffer) {
@ -1100,7 +1100,7 @@ static void
gst_mss_demux_download_loop (GstMssDemuxStream * stream) gst_mss_demux_download_loop (GstMssDemuxStream * stream)
{ {
GstMssDemux *mssdemux = stream->parent; GstMssDemux *mssdemux = stream->parent;
GstBuffer *buffer = NULL; gboolean buffer_downloaded = FALSE;
GstFlowReturn ret; GstFlowReturn ret;
GST_LOG_OBJECT (mssdemux, "download loop start %p", stream); GST_LOG_OBJECT (mssdemux, "download loop start %p", stream);
@ -1112,7 +1112,7 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
GST_DEBUG_OBJECT (mssdemux, "Finished streams reconfiguration"); GST_DEBUG_OBJECT (mssdemux, "Finished streams reconfiguration");
GST_OBJECT_UNLOCK (mssdemux); GST_OBJECT_UNLOCK (mssdemux);
ret = gst_mss_demux_stream_download_fragment (stream, &buffer); ret = gst_mss_demux_stream_download_fragment (stream, &buffer_downloaded);
if (stream->cancelled) if (stream->cancelled)
goto cancelled; goto cancelled;
@ -1130,9 +1130,10 @@ gst_mss_demux_download_loop (GstMssDemuxStream * stream)
stream->download_error_count = 0; stream->download_error_count = 0;
if (buffer) { if (buffer_downloaded) {
gst_mss_stream_advance_fragment (stream->manifest_stream); gst_mss_stream_advance_fragment (stream->manifest_stream);
} }
GST_LOG_OBJECT (mssdemux, "download loop end %p", stream); GST_LOG_OBJECT (mssdemux, "download loop end %p", stream);
return; return;