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

player: Don't report spurious STOPPED state changes when doing transient changes there

Browse Source
This commit is contained in:
Sebastian Dröge 2016-08-24 14:10:41 +03:00
parent c361907873
commit e416e79af8
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gst-libs/gst/player/gstplayer.c
View File

@ -214,7 +214,7 @@ static void gst_player_constructed (GObject * object);
static gpointer gst_player_main (gpointer data); static gpointer gst_player_main (gpointer data);
static void gst_player_seek_internal_locked (GstPlayer * self); static void gst_player_seek_internal_locked (GstPlayer * self);
static gboolean gst_player_stop_internal (gpointer user_data); static void gst_player_stop_internal (GstPlayer * self, gboolean transient);
static gboolean gst_player_pause_internal (gpointer user_data); static gboolean gst_player_pause_internal (gpointer user_data);
static gboolean gst_player_play_internal (gpointer user_data); static gboolean gst_player_play_internal (gpointer user_data);
static gboolean gst_player_seek_internal (gpointer user_data); static gboolean gst_player_seek_internal (gpointer user_data);
@ -550,7 +550,7 @@ gst_player_set_uri_internal (gpointer user_data)
{ {
GstPlayer *self = user_data; GstPlayer *self = user_data;
gst_player_stop_internal (self); gst_player_stop_internal (self, FALSE);
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
@ -592,7 +592,7 @@ gst_player_set_suburi_internal (gpointer user_data)
target_state = self->target_state; target_state = self->target_state;
position = gst_player_get_position (self); position = gst_player_get_position (self);
gst_player_stop_internal (self); gst_player_stop_internal (self, TRUE);
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
GST_DEBUG_OBJECT (self, "Changing SUBURI to '%s'", GST_DEBUG_OBJECT (self, "Changing SUBURI to '%s'",
@ -2791,7 +2791,7 @@ gst_player_play_internal (gpointer user_data)
GST_SEEK_FLAG_FLUSH, 0); GST_SEEK_FLAG_FLUSH, 0);
if (!ret) { if (!ret) {
GST_ERROR_OBJECT (self, "Seek to beginning failed"); GST_ERROR_OBJECT (self, "Seek to beginning failed");
gst_player_stop_internal (self); gst_player_stop_internal (self, TRUE);
gst_player_play_internal (self); gst_player_play_internal (self);
} }
} }
@ -2862,7 +2862,7 @@ gst_player_pause_internal (gpointer user_data)
GST_SEEK_FLAG_FLUSH, 0); GST_SEEK_FLAG_FLUSH, 0);
if (!ret) { if (!ret) {
GST_ERROR_OBJECT (self, "Seek to beginning failed"); GST_ERROR_OBJECT (self, "Seek to beginning failed");
gst_player_stop_internal (self); gst_player_stop_internal (self, TRUE);
gst_player_pause_internal (self); gst_player_pause_internal (self);
} }
} }
@ -2889,12 +2889,10 @@ gst_player_pause (GstPlayer * self)
gst_player_pause_internal, self, NULL); gst_player_pause_internal, self, NULL);
} }
static gboolean static void
gst_player_stop_internal (gpointer user_data) gst_player_stop_internal (GstPlayer * self, gboolean transient)
{ {
GstPlayer *self = GST_PLAYER (user_data); GST_DEBUG_OBJECT (self, "Stop (transient %d)", transient);
GST_DEBUG_OBJECT (self, "Stop");
tick_cb (self); tick_cb (self);
remove_tick_source (self); remove_tick_source (self);
@ -2908,7 +2906,10 @@ gst_player_stop_internal (gpointer user_data)
gst_bus_set_flushing (self->bus, TRUE); gst_bus_set_flushing (self->bus, TRUE);
gst_element_set_state (self->playbin, GST_STATE_READY); gst_element_set_state (self->playbin, GST_STATE_READY);
gst_bus_set_flushing (self->bus, FALSE); gst_bus_set_flushing (self->bus, FALSE);
change_state (self, GST_PLAYER_STATE_STOPPED); change_state (self, transient
&& self->app_state !=
GST_PLAYER_STATE_STOPPED ? GST_PLAYER_STATE_BUFFERING :
GST_PLAYER_STATE_STOPPED);
self->buffering = 100; self->buffering = 100;
g_mutex_lock (&self->lock); g_mutex_lock (&self->lock);
if (self->media_info) { if (self->media_info) {
@ -2929,10 +2930,19 @@ gst_player_stop_internal (gpointer user_data)
self->last_seek_time = GST_CLOCK_TIME_NONE; self->last_seek_time = GST_CLOCK_TIME_NONE;
self->rate = 1.0; self->rate = 1.0;
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
}
static gboolean
gst_player_stop_internal_dispatch (gpointer user_data)
{
GstPlayer *self = GST_PLAYER (user_data);
gst_player_stop_internal (self, FALSE);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
/** /**
* gst_player_stop: * gst_player_stop:
* @player: #GstPlayer instance * @player: #GstPlayer instance
@ -2950,7 +2960,7 @@ gst_player_stop (GstPlayer * self)
g_mutex_unlock (&self->lock); g_mutex_unlock (&self->lock);
g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT,
gst_player_stop_internal, self, NULL); gst_player_stop_internal_dispatch, self, NULL);
} }
/* Must be called with lock from main context, releases lock! */ /* Must be called with lock from main context, releases lock! */