From d86de48fa108583e9052ee6c3e75497b23b1bf16 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Wed, 29 Jul 2009 19:07:27 -0300 Subject: [PATCH] asfmux: accept pad requests a little longer asfmux now start rejecting pad requests after it pushes the first buffer, before this, it was rejecting after going to paused --- gst/asfmux/gstasfmux.c | 5 ++--- gst/asfmux/gstasfmux.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c index 5d42d4a7e9..32581221ed 100644 --- a/gst/asfmux/gstasfmux.c +++ b/gst/asfmux/gstasfmux.c @@ -355,7 +355,7 @@ gst_asf_mux_sink_event (GstPad * pad, GstEvent * event) * writing the headers, because tags are to be in * the headers */ - if (asfmux->state == GST_ASF_MUX_STATE_STARTED) { + if (asfmux->state == GST_ASF_MUX_STATE_NONE) { GstTagList *list = NULL; gst_event_parse_tag (event, &list); if (asfmux->merge_stream_tags) { @@ -1793,7 +1793,7 @@ gst_asf_mux_collected (GstCollectPads * collect, gpointer data) GstBuffer *buf = NULL; GSList *walk; - if (G_UNLIKELY (asfmux->state == GST_ASF_MUX_STATE_STARTED)) { + if (G_UNLIKELY (asfmux->state == GST_ASF_MUX_STATE_NONE)) { ret = gst_asf_mux_start_file (asfmux); if (ret != GST_FLOW_OK) { GST_WARNING_OBJECT (asfmux, "Failed to send headers"); @@ -2237,7 +2237,6 @@ gst_asf_mux_change_state (GstElement * element, GstStateChange transition) asfmux->preroll = asfmux->prop_preroll; asfmux->merge_stream_tags = asfmux->prop_merge_stream_tags; gst_collect_pads_start (asfmux->collect); - asfmux->state = GST_ASF_MUX_STATE_STARTED; break; case GST_STATE_CHANGE_PAUSED_TO_PLAYING: break; diff --git a/gst/asfmux/gstasfmux.h b/gst/asfmux/gstasfmux.h index 280b675303..2b71fa36e7 100644 --- a/gst/asfmux/gstasfmux.h +++ b/gst/asfmux/gstasfmux.h @@ -50,7 +50,6 @@ typedef enum _GstAsfMuxState GstAsfMuxState; enum _GstAsfMuxState { GST_ASF_MUX_STATE_NONE, - GST_ASF_MUX_STATE_STARTED, GST_ASF_MUX_STATE_HEADERS, GST_ASF_MUX_STATE_DATA, GST_ASF_MUX_STATE_EOS