mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 14:36:24 +00:00
flvmux: Update for new collectpads2 event handling API
This commit is contained in:
parent
934cd01480
commit
76a22a6ebb
1 changed files with 8 additions and 2 deletions
|
@ -305,7 +305,6 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
|
||||||
ret = gst_flv_mux_audio_pad_setcaps (data->pad, caps);
|
ret = gst_flv_mux_audio_pad_setcaps (data->pad, caps);
|
||||||
}
|
}
|
||||||
/* and eat */
|
/* and eat */
|
||||||
ret = FALSE;
|
|
||||||
gst_event_unref (event);
|
gst_event_unref (event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -317,13 +316,20 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data,
|
||||||
gst_event_parse_tag (event, &list);
|
gst_event_parse_tag (event, &list);
|
||||||
gst_tag_setter_merge_tags (setter, list, mode);
|
gst_tag_setter_merge_tags (setter, list, mode);
|
||||||
mux->new_tags = TRUE;
|
mux->new_tags = TRUE;
|
||||||
|
ret = TRUE;
|
||||||
|
gst_event_unref (event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case GST_EVENT_EOS:
|
||||||
|
case GST_EVENT_SEGMENT:
|
||||||
|
gst_event_unref (event);
|
||||||
|
ret = TRUE;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
|
ret = gst_pad_event_default (data->pad, GST_OBJECT (mux), event);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* now GstCollectPads2 can take care of the rest, e.g. EOS */
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue