mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegstream/: Do state changes correctly

Browse source 
Original commit message from CVS:
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_change_state):
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_change_state):
* gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_change_state):
Do state changes correctly
This commit is contained in:
Wim Taymans 2006-04-21 10:50:17 +00:00
parent 8a3cf8eb23
commit 502fabd67b
4 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-21 Wim Taymans <wim@fluendo.com>
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_change_state):
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_change_state):
* gst/mpegstream/gstrfc2250enc.c: (gst_rfc2250_enc_change_state):
Do state changes correctly
2006-04-13 Tim-Philipp Müller <tim at centricular dot net> 2006-04-13 Tim-Philipp Müller <tim at centricular dot net>
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_alloc_sized_buf), * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_alloc_sized_buf),

6
gst/mpegstream/gstdvddemux.c
View file

@ -1157,6 +1157,9 @@ static GstStateChangeReturn
gst_dvd_demux_change_state (GstElement * element, GstStateChange transition) gst_dvd_demux_change_state (GstElement * element, GstStateChange transition)
{ {
GstDVDDemux *dvd_demux = GST_DVD_DEMUX (element); GstDVDDemux *dvd_demux = GST_DVD_DEMUX (element);
GstStateChangeReturn ret;
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
@ -1169,8 +1172,7 @@ gst_dvd_demux_change_state (GstElement * element, GstStateChange transition)
default: default:
break; break;
} }
return ret;
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }
gboolean gboolean

6
gst/mpegstream/gstmpegdemux.c
View file

@ -1233,6 +1233,9 @@ static GstStateChangeReturn
gst_mpeg_demux_change_state (GstElement * element, GstStateChange transition) gst_mpeg_demux_change_state (GstElement * element, GstStateChange transition)
{ {
GstMPEGDemux *mpeg_demux = GST_MPEG_DEMUX (element); GstMPEGDemux *mpeg_demux = GST_MPEG_DEMUX (element);
GstStateChangeReturn ret;
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
@ -1241,8 +1244,7 @@ gst_mpeg_demux_change_state (GstElement * element, GstStateChange transition)
default: default:
break; break;
} }
return ret;
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }
static void static void

13
gst/mpegstream/gstrfc2250enc.c
View file

@ -296,6 +296,7 @@ static GstStateChangeReturn
gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition) gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRFC2250Enc *rfc2250_enc = GST_RFC2250_ENC (element); GstRFC2250Enc *rfc2250_enc = GST_RFC2250_ENC (element);
GstStateChangeReturn ret;
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
@ -305,6 +306,13 @@ gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition)
GST_MPEG_PACKETIZE_VIDEO); GST_MPEG_PACKETIZE_VIDEO);
} }
break; break;
default:
break;
}
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (rfc2250_enc->packetize) { if (rfc2250_enc->packetize) {
gst_mpeg_packetize_destroy (rfc2250_enc->packetize); gst_mpeg_packetize_destroy (rfc2250_enc->packetize);
@ -314,10 +322,7 @@ gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition)
default: default:
break; break;
} }
return ret;
GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return GST_STATE_CHANGE_SUCCESS;
} }
static void static void