mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
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
This commit is contained in:
parent
7dd441f8f5
commit
d86de48fa1
2 changed files with 2 additions and 4 deletions
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue