mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbisparse: Pass correct header buffer size to libvorbis and include channels/rate in the srcpad caps

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-27 12:08:33 +01:00
parent e2c50fbf0c
commit 76b7ff8f99
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/vorbis/gstvorbisparse.c
View file

@ -189,13 +189,6 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
ogg_packet packet;
GstMapInfo map;
/* get the headers into the caps, passing them to vorbis as we go */
caps = gst_caps_make_writable (gst_pad_query_caps (parse->srcpad, NULL));
vorbis_parse_set_header_on_caps (parse, caps);
GST_DEBUG_OBJECT (parse, "here are the caps: %" GST_PTR_FORMAT, caps);
gst_pad_set_caps (parse->srcpad, caps);
gst_caps_unref (caps);
outbuf = GST_BUFFER_CAST (parse->streamheader->data);
gst_buffer_map (outbuf, &map, GST_MAP_READ);
packet.packet = map.data;
@ -207,6 +200,7 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
vorbis_synthesis_headerin (&parse->vi, &parse->vc, &packet);
gst_buffer_unmap (outbuf, &map);
parse->sample_rate = parse->vi.rate;
parse->channels = parse->vi.channels;
outbuf1 = outbuf;
outbuf = GST_BUFFER_CAST (parse->streamheader->next->data);
@ -224,6 +218,7 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
outbuf = GST_BUFFER_CAST (parse->streamheader->next->next->data);
gst_buffer_map (outbuf, &map, GST_MAP_READ);
packet.packet = map.data;
packet.bytes = map.size;
packet.granulepos = GST_BUFFER_OFFSET_END (outbuf);
packet.packetno = 3;
packet.e_o_s = 0;
@ -232,6 +227,15 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
gst_buffer_unmap (outbuf, &map);
outbuf3 = outbuf;
/* get the headers into the caps, passing them to vorbis as we go */
caps = gst_caps_new_simple ("audio/x-vorbis",
"rate", G_TYPE_INT, parse->sample_rate,
"channels", G_TYPE_INT, parse->channels, NULL);;
vorbis_parse_set_header_on_caps (parse, caps);
GST_DEBUG_OBJECT (parse, "here are the caps: %" GST_PTR_FORMAT, caps);
gst_pad_set_caps (parse->srcpad, caps);
gst_caps_unref (caps);
/* first process queued events */
vorbis_parse_drain_event_queue (parse);

1
ext/vorbis/gstvorbisparse.h
View file

@ -66,6 +66,7 @@ struct _GstVorbisParse {
gint64 prev_granulepos;
gint32 prev_blocksize;
guint32 sample_rate;
guint32 channels;
};
struct _GstVorbisParseClass {