diff options
| author | Thiago Santos <thiagoss@embedded.ufcg.edu.br> | 2009-07-29 19:07:27 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@embedded.ufcg.edu.br> | 2009-07-30 10:33:04 -0300 |
| commit | d86de48fa108583e9052ee6c3e75497b23b1bf16 (patch) | |
| tree | 266685b7f62ca58de93da1f7e0120b953fe45204 /gst/asfmux | |
| parent | 7dd441f8f506145d5f66efd670731f9d9d70844e (diff) | |
| download | gst-plugins-bad-d86de48fa108583e9052ee6c3e75497b23b1bf16.tar.gz gst-plugins-bad-d86de48fa108583e9052ee6c3e75497b23b1bf16.tar.bz2 gst-plugins-bad-d86de48fa108583e9052ee6c3e75497b23b1bf16.zip | |
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
Diffstat (limited to 'gst/asfmux')
| -rw-r--r-- | gst/asfmux/gstasfmux.c | 5 | ||||
| -rw-r--r-- | 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 5d42d4a7..32581221 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 280b6753..2b71fa36 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 |