diff --git a/ChangeLog b/ChangeLog index 88bbcf5970..f3beb07a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-22 Martin Soto + + * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_process_event): + Erase spurious call to gst_segment_set_newsegment. + * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_process_event): Call + the superclass method when handling NEWSEGMENT events. + (gst_dvd_demux_handle_dvd_event): Get rid of dvd-audio-shutdown + and dvd-audio-restart event handling. There are currently less + hackish ways of handling the sparse audio stream problem. + 2006-01-20 Thomas Vander Stichele * ext/dvdnav/dvdnavsrc.c: (if): diff --git a/common b/common index e0b121388e..bc4325349e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf +Subproject commit bc4325349e8d0ec90aa5c5e74566880cc2e82527 diff --git a/gst/mpegstream/gstdvddemux.c b/gst/mpegstream/gstdvddemux.c index aa30974ddc..52c31a59c2 100644 --- a/gst/mpegstream/gstdvddemux.c +++ b/gst/mpegstream/gstdvddemux.c @@ -318,6 +318,8 @@ gst_dvd_demux_process_event (GstMPEGParse * mpeg_parse, GstEvent * event) dvd_demux->segment_filter = TRUE; } + ret = GST_MPEG_PARSE_CLASS (parent_class)->process_event (mpeg_parse, + event); break; } case GST_EVENT_FLUSH_STOP: @@ -374,23 +376,6 @@ gst_dvd_demux_handle_dvd_event (GstDVDDemux * dvd_demux, GstEvent * event) } gst_dvd_demux_set_cur_audio (dvd_demux, stream_nr); gst_event_unref (event); - } else if (strcmp (event_type, "dvd-audio-shutdown") == 0) { - /* Send an EOS down the audio path to effectively shut it down and - allow for preroll in the absence of audio material. */ - gst_event_unref (event); - return gst_pad_push_event (dvd_demux->cur_audio, gst_event_new_eos ()); - } else if (strcmp (event_type, "dvd-audio-restart") == 0) { - /* Restart the audio pipeline after an EOS by flushing it. */ - gst_event_unref (event); - if (!gst_pad_push_event (dvd_demux->cur_audio, - gst_event_new_flush_start ())) { - return FALSE; - } - if (!gst_pad_push_event (dvd_demux->cur_audio, gst_event_new_flush_stop ())) { - return FALSE; - } - dvd_demux->segment_filter = TRUE; - return TRUE; } else if (strcmp (event_type, "dvd-spu-stream-change") == 0) { gint stream_nr; diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c index 01eba3c13a..355acff9b7 100644 --- a/gst/mpegstream/gstmpegparse.c +++ b/gst/mpegstream/gstmpegparse.c @@ -375,8 +375,6 @@ gst_mpeg_parse_process_event (GstMPEGParse * mpeg_parse, GstEvent * event) "Updating current segment with newsegment"); gst_segment_set_newsegment (&mpeg_parse->current_segment, update, rate, format, start, stop, time); - gst_segment_set_newsegment (&mpeg_parse->current_segment, - update, rate, format, start, stop, time); if (!update) { /* Send a newsegment event for the new current segment. */