mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 19:55:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

element: Add missing values for "to same" state changes

Browse source 
And handle newly added GstStateChange values in GstPipeline

https://bugzilla.gnome.org/show_bug.cgi?id=783798
This commit is contained in:
Thibault Saunier 2017-06-15 10:38:29 -04:00
parent c30c39b5ad
commit 54e16cc34e
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/gstelement.h
View file

@ -230,6 +230,14 @@ typedef enum {
* @GST_STATE_CHANGE_READY_TO_NULL : state change from READY to NULL.
* * Elements close devices
* * Elements reset any internal state.
* @GST_STATE_CHANGE_NULL_TO_NULL : state change from NULL to NULL. (Since 1.14)
* @GST_STATE_CHANGE_READY_TO_READY : state change from READY to READY,
* This might happen when going to PAUSED asynchronously failed, in that case
* elements should make sure they are in a proper, coherent READY state. (Since 1.14)
* @GST_STATE_CHANGE_PAUSED_TO_PAUSED : state change from PAUSED to PAUSED.
* This might happen when elements were in PLAYING state and 'lost state',
* they should make sure to go back to real 'PAUSED' state (prerolling for example). (Since 1.14)
* @GST_STATE_CHANGE_PLAYING_TO_PLAYING : state change from PLAYING to PLAYING. (Since 1.14)
*
* These are the different state changes an element goes through.
* %GST_STATE_NULL ⇒ %GST_STATE_PLAYING is called an upwards state change
@ -242,7 +250,11 @@ typedef enum /*< flags=0 >*/
GST_STATE_CHANGE_PAUSED_TO_PLAYING = (GST_STATE_PAUSED<<3) | GST_STATE_PLAYING,
GST_STATE_CHANGE_PLAYING_TO_PAUSED = (GST_STATE_PLAYING<<3) | GST_STATE_PAUSED,
GST_STATE_CHANGE_PAUSED_TO_READY = (GST_STATE_PAUSED<<3) | GST_STATE_READY,
GST_STATE_CHANGE_READY_TO_NULL = (GST_STATE_READY<<3) | GST_STATE_NULL
GST_STATE_CHANGE_READY_TO_NULL = (GST_STATE_READY<<3) | GST_STATE_NULL,
GST_STATE_CHANGE_NULL_TO_NULL = (GST_STATE_NULL<<3) | GST_STATE_NULL,
GST_STATE_CHANGE_READY_TO_READY = (GST_STATE_READY<<3) | GST_STATE_READY,
GST_STATE_CHANGE_PAUSED_TO_PAUSED = (GST_STATE_PAUSED<<3) | GST_STATE_PAUSED,
GST_STATE_CHANGE_PLAYING_TO_PLAYING = (GST_STATE_PLAYING<<3) | GST_STATE_PLAYING
} GstStateChange;
/**

16
gst/gstpipeline.c
View file

@ -381,6 +381,14 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
GstClock *clock;
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_NULL:
break;
case GST_STATE_CHANGE_READY_TO_READY:
break;
case GST_STATE_CHANGE_PAUSED_TO_PAUSED:
break;
case GST_STATE_CHANGE_PLAYING_TO_PLAYING:
break;
case GST_STATE_CHANGE_NULL_TO_READY:
GST_OBJECT_LOCK (element);
if (element->bus)
@ -500,6 +508,14 @@ gst_pipeline_change_state (GstElement * element, GstStateChange transition)
result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_NULL:
break;
case GST_STATE_CHANGE_READY_TO_READY:
break;
case GST_STATE_CHANGE_PAUSED_TO_PAUSED:
break;
case GST_STATE_CHANGE_PLAYING_TO_PLAYING:
break;
case GST_STATE_CHANGE_NULL_TO_READY:
break;
case GST_STATE_CHANGE_READY_TO_PAUSED: