FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixed state machine

Browse Source
This commit is contained in:
David Corvoysier 2012-10-16 16:34:10 +02:00 committed by Thiago Santos
parent 7f2207732b
commit f4756f7cb0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/dash/gstdashdemux.c
View File

@ -436,13 +436,13 @@ gst_dash_demux_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
gst_dash_demux_pause_stream_task (demux); gst_dash_demux_pause_stream_task (demux);
gst_task_pause (demux->stream_task);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
demux->cancelled = TRUE; demux->cancelled = TRUE;
gst_dash_demux_stop (demux); gst_dash_demux_stop (demux);
gst_task_join (demux->stream_task); gst_task_join (demux->stream_task);
gst_dash_demux_reset (demux, FALSE); gst_task_join (demux->download_task);
GST_WARNING_OBJECT (demux, "DASH demux now terminated");
break; break;
default: default:
break; break;
@ -1514,7 +1514,7 @@ gst_dash_demux_get_next_fragment_set (GstDashDemux * demux)
next_fragment_uri); next_fragment_uri);
if (download == NULL) if (download == NULL)
goto error; return FALSE;
download->start_time = timestamp; download->start_time = timestamp;
download->stop_time = timestamp + duration; download->stop_time = timestamp + duration;
@ -1522,7 +1522,7 @@ gst_dash_demux_get_next_fragment_set (GstDashDemux * demux)
stream = stream =
gst_mpdparser_get_active_stream_by_index (demux->client, stream_idx); gst_mpdparser_get_active_stream_by_index (demux->client, stream_idx);
if (stream == NULL) if (stream == NULL)
goto error; return FALSE;
download->index = stream->segment_idx; download->index = stream->segment_idx;
GstCaps *caps = gst_dash_demux_get_input_caps (demux, stream); GstCaps *caps = gst_dash_demux_get_input_caps (demux, stream);
@ -1561,11 +1561,5 @@ gst_dash_demux_get_next_fragment_set (GstDashDemux * demux)
GST_INFO_OBJECT (demux, "Download rate = %d Kbits/s (%d Ko in %.2f s)", GST_INFO_OBJECT (demux, "Download rate = %d Kbits/s (%d Ko in %.2f s)",
demux->dnl_rate / 1000, size_buffer / 1024, ((double) diff / GST_SECOND)); demux->dnl_rate / 1000, size_buffer / 1024, ((double) diff / GST_SECOND));
return TRUE; return TRUE;
error:
{
gst_dash_demux_stop (demux);
return FALSE;
}
} }