mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-11 16:55:23 +00:00
oggmux: don't send a segment event before the caps event
https://bugzilla.gnome.org/show_bug.cgi?id=699971
This commit is contained in:
parent
6f233f67ef
commit
46aff49316
1 changed files with 4 additions and 5 deletions
|
@ -1544,8 +1544,12 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
|
||||||
if (!gst_caps_is_fixed (caps))
|
if (!gst_caps_is_fixed (caps))
|
||||||
caps = gst_caps_fixate (caps);
|
caps = gst_caps_fixate (caps);
|
||||||
if (caps) {
|
if (caps) {
|
||||||
|
GstSegment segment;
|
||||||
|
|
||||||
caps = gst_ogg_mux_set_header_on_caps (caps, hbufs);
|
caps = gst_ogg_mux_set_header_on_caps (caps, hbufs);
|
||||||
gst_pad_set_caps (mux->srcpad, caps);
|
gst_pad_set_caps (mux->srcpad, caps);
|
||||||
|
gst_segment_init (&segment, GST_FORMAT_TIME);
|
||||||
|
gst_pad_push_event (mux->srcpad, gst_event_new_segment (&segment));
|
||||||
gst_caps_unref (caps);
|
gst_caps_unref (caps);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1931,17 +1935,12 @@ all_pads_eos (GstCollectPads * pads)
|
||||||
static void
|
static void
|
||||||
gst_ogg_mux_send_start_events (GstOggMux * ogg_mux, GstCollectPads * pads)
|
gst_ogg_mux_send_start_events (GstOggMux * ogg_mux, GstCollectPads * pads)
|
||||||
{
|
{
|
||||||
GstSegment segment;
|
|
||||||
gchar s_id[32];
|
gchar s_id[32];
|
||||||
|
|
||||||
/* stream-start (FIXME: create id based on input ids) */
|
/* stream-start (FIXME: create id based on input ids) */
|
||||||
g_snprintf (s_id, sizeof (s_id), "oggmux-%08x", g_random_int ());
|
g_snprintf (s_id, sizeof (s_id), "oggmux-%08x", g_random_int ());
|
||||||
gst_pad_push_event (ogg_mux->srcpad, gst_event_new_stream_start (s_id));
|
gst_pad_push_event (ogg_mux->srcpad, gst_event_new_stream_start (s_id));
|
||||||
|
|
||||||
/* segment */
|
|
||||||
gst_segment_init (&segment, GST_FORMAT_BYTES);
|
|
||||||
gst_pad_push_event (ogg_mux->srcpad, gst_event_new_segment (&segment));
|
|
||||||
|
|
||||||
/* we'll send caps later, need to collect all headers first */
|
/* we'll send caps later, need to collect all headers first */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue