FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ivorbis: extract vorbis comments

Browse Source 
Fixes #575818.
This commit is contained in:
Tim-Philipp Müller 2009-07-10 13:03:54 +01:00
parent b870322686
commit 011e9c10f0
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/ivorbis/Makefile.am
View File

@ -3,10 +3,10 @@ plugin_LTLIBRARIES = libgstivorbis.la
libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c
libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) \ libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) \
$(IVORBISFILE_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \
-lgsttag-@GST_MAJORMINOR@
libgstivorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstivorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstivorbis_la_LIBTOOLFLAGS = --tag=disable-static libgstivorbis_la_LIBTOOLFLAGS = --tag=disable-static

19
ext/ivorbis/vorbisdec.c
View File

@ -651,23 +651,26 @@ channel_count_error:
static GstFlowReturn static GstFlowReturn
vorbis_handle_comment_packet (GstIVorbisDec * vd, ogg_packet * packet) vorbis_handle_comment_packet (GstIVorbisDec * vd, ogg_packet * packet)
{ {
#if 0
guint bitrate = 0; guint bitrate = 0;
gchar *encoder = NULL; gchar *encoder = NULL;
GstTagList *list; GstTagList *list, *old_list;
GstBuffer *buf; GstBuffer *buf;
GST_DEBUG_OBJECT (vd, "parsing comment packet"); GST_DEBUG_OBJECT (vd, "parsing comment packet");
buf = gst_buffer_new_and_alloc (packet->bytes); buf = gst_buffer_new ();
GST_BUFFER_DATA (buf) = packet->packet; GST_BUFFER_DATA (buf) = packet->packet->buffer->data;
GST_BUFFER_SIZE (buf) = packet->packet->buffer->size;
list = list =
gst_tag_list_from_vorbiscomment_buffer (buf, (guint8 *) "\003vorbis", 7, gst_tag_list_from_vorbiscomment_buffer (buf, (guint8 *) "\003vorbis", 7,
&encoder); &encoder);
old_list = vd->taglist;
vd->taglist = gst_tag_list_merge (vd->taglist, list, GST_TAG_MERGE_REPLACE); vd->taglist = gst_tag_list_merge (vd->taglist, list, GST_TAG_MERGE_REPLACE);
if (old_list)
gst_tag_list_free (old_list);
gst_tag_list_free (list); gst_tag_list_free (list);
gst_buffer_unref (buf); gst_buffer_unref (buf);
@ -683,18 +686,18 @@ vorbis_handle_comment_packet (GstIVorbisDec * vd, ogg_packet * packet)
gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_ENCODER_VERSION, vd->vi.version, GST_TAG_ENCODER_VERSION, vd->vi.version,
GST_TAG_AUDIO_CODEC, "Vorbis", NULL); GST_TAG_AUDIO_CODEC, "Vorbis", NULL);
if (vd->vi.bitrate_nominal > 0) { if (vd->vi.bitrate_nominal > 0 && vd->vi.bitrate_nominal <= 0x7FFFFFFF) {
gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_NOMINAL_BITRATE, (guint) vd->vi.bitrate_nominal, NULL); GST_TAG_NOMINAL_BITRATE, (guint) vd->vi.bitrate_nominal, NULL);
bitrate = vd->vi.bitrate_nominal; bitrate = vd->vi.bitrate_nominal;
} }
if (vd->vi.bitrate_upper > 0) { if (vd->vi.bitrate_upper > 0 && vd->vi.bitrate_upper <= 0x7FFFFFFF) {
gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_MAXIMUM_BITRATE, (guint) vd->vi.bitrate_upper, NULL); GST_TAG_MAXIMUM_BITRATE, (guint) vd->vi.bitrate_upper, NULL);
if (!bitrate) if (!bitrate)
bitrate = vd->vi.bitrate_upper; bitrate = vd->vi.bitrate_upper;
} }
if (vd->vi.bitrate_lower > 0) { if (vd->vi.bitrate_lower > 0 && vd->vi.bitrate_lower <= 0x7FFFFFFF) {
gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_MINIMUM_BITRATE, (guint) vd->vi.bitrate_lower, NULL); GST_TAG_MINIMUM_BITRATE, (guint) vd->vi.bitrate_lower, NULL);
if (!bitrate) if (!bitrate)
@ -715,7 +718,7 @@ vorbis_handle_comment_packet (GstIVorbisDec * vd, ogg_packet * packet)
gst_element_post_message (GST_ELEMENT_CAST (vd), gst_element_post_message (GST_ELEMENT_CAST (vd),
gst_message_new_tag (GST_OBJECT (vd), gst_tag_list_copy (vd->taglist))); gst_message_new_tag (GST_OBJECT (vd), gst_tag_list_copy (vd->taglist)));
} }
#endif
return GST_FLOW_OK; return GST_FLOW_OK;
} }