mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-07-10 13:49:14 +02:00
commit 376164ab08
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ext/ogg/gstoggmux.c
View file

@ -1319,14 +1319,31 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPadData * best)
GST_LOG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT GST_LOG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT
", currently pulling from %" GST_PTR_FORMAT, best->collect.pad, ", currently pulling from %" GST_PTR_FORMAT, best->collect.pad,
ogg_mux->pulling); ogg_mux->pulling ? ogg_mux->pulling->collect.pad : NULL);
next_buf = gst_collect_pads_peek (ogg_mux->collect, &best->collect); if (ogg_mux->pulling) {
if (next_buf) { next_buf = gst_collect_pads_peek (ogg_mux->collect,
best->eos = FALSE; &ogg_mux->pulling->collect);
gst_buffer_unref (next_buf); if (next_buf) {
} else { ogg_mux->pulling->eos = FALSE;
best->eos = TRUE; gst_buffer_unref (next_buf);
} else {
GST_DEBUG_OBJECT (ogg_mux->pulling->collect.pad, "setting eos to true");
ogg_mux->pulling->eos = TRUE;
}
}
/* We could end up pushing from the best pad instead, so check that
* as well */
if (best && best != ogg_mux->pulling) {
next_buf = gst_collect_pads_peek (ogg_mux->collect, &best->collect);
if (next_buf) {
best->eos = FALSE;
gst_buffer_unref (next_buf);
} else {
GST_DEBUG_OBJECT (best->collect.pad, "setting eos to true");
best->eos = TRUE;
}
} }
/* if we were already pulling from one pad, but the new "best" buffer is /* if we were already pulling from one pad, but the new "best" buffer is
@ -1432,7 +1449,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPadData * best)
GST_GP_CAST (packet.granulepos), (gint64) packet.packetno, GST_GP_CAST (packet.granulepos), (gint64) packet.packetno,
packet.bytes); packet.bytes);
packet.e_o_s = best->eos ? 1 : 0; packet.e_o_s = ogg_mux->pulling->eos ? 1 : 0;
tmpbuf = NULL; tmpbuf = NULL;
/* we flush when we see a new keyframe */ /* we flush when we see a new keyframe */
@ -1620,7 +1637,8 @@ all_pads_eos (GstCollectPads * pads)
while (walk) { while (walk) {
GstOggPadData *oggpad = (GstOggPadData *) walk->data; GstOggPadData *oggpad = (GstOggPadData *) walk->data;
GST_DEBUG ("oggpad %p eos %d", oggpad, oggpad->eos); GST_DEBUG_OBJECT (oggpad->collect.pad,
"oggpad %p eos %d", oggpad, oggpad->eos);
if (oggpad->eos == FALSE) if (oggpad->eos == FALSE)
return FALSE; return FALSE;

2
gst/typefind/gsttypefindfunctions.c
View file

@ -4564,7 +4564,7 @@ plugin_init (GstPlugin * plugin)
TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-vgm", TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-vgm",
GST_RANK_SECONDARY, vgm_exts, "Vgm\x20", 4, GST_TYPE_FIND_MAXIMUM); GST_RANK_SECONDARY, vgm_exts, "Vgm\x20", 4, GST_TYPE_FIND_MAXIMUM);
TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-sap", TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-sap",
GST_RANK_SECONDARY, sap_exts, "SAP\x0d\x0aAUTHOR\x20", 12, GST_RANK_SECONDARY, sap_exts, "SAP\x0d\x0a" "AUTHOR\x20", 12,
GST_TYPE_FIND_MAXIMUM); GST_TYPE_FIND_MAXIMUM);
TYPE_FIND_REGISTER_START_WITH (plugin, "video/x-ivf", GST_RANK_SECONDARY, TYPE_FIND_REGISTER_START_WITH (plugin, "video/x-ivf", GST_RANK_SECONDARY,
ivf_exts, "DKIF", 4, GST_TYPE_FIND_NEARLY_CERTAIN); ivf_exts, "DKIF", 4, GST_TYPE_FIND_NEARLY_CERTAIN);