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

oggstream: streamline tag extraction and prevent some leaks

Browse Source
This commit is contained in:
Mark Nauwelaerts 2010-10-27 10:59:03 +02:00
parent 63ba9eafb1
commit 515f33bd3b
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/ogg/gstoggstream.c
View File

@ -605,6 +605,9 @@ is_header_vp8 (GstOggStream * pad, ogg_packet * packet)
GST_BUFFER_DATA (buf) = (guint8 *) packet->packet; GST_BUFFER_DATA (buf) = (guint8 *) packet->packet;
GST_BUFFER_SIZE (buf) = packet->bytes; GST_BUFFER_SIZE (buf) = packet->bytes;
if (pad->taglist)
gst_tag_list_free (pad->taglist);
pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf, pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf,
(const guint8 *) "OVP80\2 ", 7, &encoder); (const guint8 *) "OVP80\2 ", 7, &encoder);
if (!pad->taglist) { if (!pad->taglist) {
@ -655,18 +658,14 @@ setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet)
data += 4; data += 4;
pad->bitrate_lower = GST_READ_UINT32_LE (data); pad->bitrate_lower = GST_READ_UINT32_LE (data);
if (pad->bitrate_nominal > 0 && pad->bitrate_nominal <= 0x7FFFFFFF) if (pad->bitrate_nominal > 0)
pad->bitrate = pad->bitrate_nominal; pad->bitrate = pad->bitrate_nominal;
if (pad->bitrate_upper > 0 && pad->bitrate_upper <= 0x7FFFFFFF) if (pad->bitrate_upper > 0 && !pad->bitrate)
if (!pad->bitrate) pad->bitrate = pad->bitrate_upper;
pad->bitrate = pad->bitrate_upper;
if (pad->bitrate_lower > 0 && pad->bitrate_lower <= 0x7FFFFFFF) if (pad->bitrate_lower > 0 && !pad->bitrate)
if (!pad->bitrate) pad->bitrate = pad->bitrate_lower;
pad->bitrate = pad->bitrate_lower;
pad->taglist = NULL;
GST_LOG ("bit rate: %d", pad->bitrate); GST_LOG ("bit rate: %d", pad->bitrate);
@ -693,10 +692,14 @@ is_header_vorbis (GstOggStream * pad, ogg_packet * packet)
if (((guint8 *) (packet->packet))[0] == 0x03) { if (((guint8 *) (packet->packet))[0] == 0x03) {
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
gchar *encoder = NULL; gchar *encoder = NULL;
buf = gst_buffer_new (); buf = gst_buffer_new ();
GST_BUFFER_DATA (buf) = (guint8 *) packet->packet; GST_BUFFER_DATA (buf) = (guint8 *) packet->packet;
GST_BUFFER_SIZE (buf) = packet->bytes; GST_BUFFER_SIZE (buf) = packet->bytes;
if (pad->taglist)
gst_tag_list_free (pad->taglist);
pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf, pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf,
(const guint8 *) "\003vorbis", 7, &encoder); (const guint8 *) "\003vorbis", 7, &encoder);
@ -716,15 +719,15 @@ is_header_vorbis (GstOggStream * pad, ogg_packet * packet)
gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_ENCODER_VERSION, pad->version, NULL); GST_TAG_ENCODER_VERSION, pad->version, NULL);
if (pad->bitrate_nominal > 0 && pad->bitrate_nominal <= 0x7FFFFFFF) if (pad->bitrate_nominal > 0)
gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_NOMINAL_BITRATE, (guint) pad->bitrate_nominal, NULL); GST_TAG_NOMINAL_BITRATE, (guint) pad->bitrate_nominal, NULL);
if (pad->bitrate_upper > 0 && pad->bitrate_upper <= 0x7FFFFFFF) if (pad->bitrate_upper > 0)
gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_MAXIMUM_BITRATE, (guint) pad->bitrate_upper, NULL); GST_TAG_MAXIMUM_BITRATE, (guint) pad->bitrate_upper, NULL);
if (pad->bitrate_lower > 0 && pad->bitrate_lower <= 0x7FFFFFFF) if (pad->bitrate_lower > 0)
gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE, gst_tag_list_add (pad->taglist, GST_TAG_MERGE_REPLACE,
GST_TAG_MINIMUM_BITRATE, (guint) pad->bitrate_lower, NULL); GST_TAG_MINIMUM_BITRATE, (guint) pad->bitrate_lower, NULL);
@ -1301,6 +1304,9 @@ is_header_ogm (GstOggStream * pad, ogg_packet * packet)
GST_BUFFER_DATA (buf) = (guint8 *) packet->packet; GST_BUFFER_DATA (buf) = (guint8 *) packet->packet;
GST_BUFFER_SIZE (buf) = packet->bytes;; GST_BUFFER_SIZE (buf) = packet->bytes;;
if (pad->taglist)
gst_tag_list_free (pad->taglist);
pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf, pad->taglist = gst_tag_list_from_vorbiscomment_buffer (buf,
(const guint8 *) "\003vorbis", 7, &encoder); (const guint8 *) "\003vorbis", 7, &encoder);

6
ext/ogg/gstoggstream.h
View File

@ -81,9 +81,9 @@ struct _GstOggStream
int vorbis_mode_sizes[256]; int vorbis_mode_sizes[256];
int last_size; int last_size;
int version; int version;
long bitrate_upper; gint bitrate_upper;
long bitrate_nominal; gint bitrate_nominal;
long bitrate_lower; gint bitrate_lower;
GstTagList *taglist; GstTagList *taglist;
/* theora stuff */ /* theora stuff */
gboolean theora_has_zero_keyoffset; gboolean theora_has_zero_keyoffset;