mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

- Renegotiate if format changes

Browse source 
Original commit message from CVS:
- Renegotiate if format changes
- properly skip the id3 tags
This commit is contained in:
Wim Taymans 2002-11-08 20:39:58 +00:00
parent 58d438a776
commit f8b0cdb562
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
ext/mad/gstmad.c
View file

@ -60,7 +60,6 @@ struct _GstMad {
struct mad_header header; struct mad_header header;
gboolean new_header; gboolean new_header;
gboolean can_seek; gboolean can_seek;
gint channels;
guint framecount; guint framecount;
gint vbr_average; /* average bitrate */ gint vbr_average; /* average bitrate */
guint64 vbr_rate; /* average * framecount */ guint64 vbr_rate; /* average * framecount */
@ -70,8 +69,9 @@ struct _GstMad {
GstCaps *metadata; GstCaps *metadata;
/* caps */ /* negotiated format */
gboolean caps_set; gint rate;
gint channels;
}; };
struct _GstMadClass { struct _GstMadClass {
@ -763,9 +763,6 @@ G_STMT_START{ \
if (header->bitrate != mad->header.bitrate || mad->new_header) { if (header->bitrate != mad->header.bitrate || mad->new_header) {
mad->header.bitrate = header->bitrate; mad->header.bitrate = header->bitrate;
} }
if (mad->channels != MAD_NCHANNELS (header) || mad->new_header) {
mad->channels = MAD_NCHANNELS (header);
}
mad->new_header = FALSE; mad->new_header = FALSE;
g_object_thaw_notify (G_OBJECT (mad)); g_object_thaw_notify (G_OBJECT (mad));
@ -925,9 +922,6 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
gint n = GST_EVENT_DISCONT_OFFSET_LEN (event); gint n = GST_EVENT_DISCONT_OFFSET_LEN (event);
gint i; gint i;
if (!GST_PAD_IS_USABLE (mad->srcpad))
return;
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
if (gst_pad_handles_format (pad, GST_EVENT_DISCONT_OFFSET(event,i).format)) if (gst_pad_handles_format (pad, GST_EVENT_DISCONT_OFFSET(event,i).format))
{ {
@ -950,8 +944,11 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
mad->base_time = time; mad->base_time = time;
gst_event_unref (event); gst_event_unref (event);
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, NULL);
gst_pad_push (mad->srcpad, GST_BUFFER (discont)); if (GST_PAD_IS_USABLE (mad->srcpad)) {
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, NULL);
gst_pad_push (mad->srcpad, GST_BUFFER (discont));
}
break; break;
} }
} }
@ -1006,6 +1003,7 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
gint consumed; gint consumed;
guint nchannels; guint nchannels;
guint nsamples; guint nsamples;
gint rate;
mad_stream_buffer (&mad->stream, mad_input_buffer, mad->tempsize); mad_stream_buffer (&mad->stream, mad_input_buffer, mad->tempsize);
@ -1035,7 +1033,9 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
data = mad->stream.this_frame; data = mad->stream.this_frame;
mad_stream_skip(&mad->stream, tagsize); /* mad has moved the pointer to the next frame over the start of the
* id3 tags, so we need to flush one byte less n the tagsize */
mad_stream_skip(&mad->stream, tagsize-1);
tag = id3_tag_parse (data, tagsize); tag = id3_tag_parse (data, tagsize);
if (tag) { if (tag) {
@ -1045,6 +1045,8 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
} }
} }
} }
mad_frame_mute (&mad->frame);
mad_synth_mute (&mad->synth);
mad_stream_sync (&mad->stream); mad_stream_sync (&mad->stream);
/* recoverable errors pass */ /* recoverable errors pass */
goto next; goto next;
@ -1054,17 +1056,18 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
nsamples = MAD_NSBSAMPLES (&mad->frame.header) * nsamples = MAD_NSBSAMPLES (&mad->frame.header) *
(mad->stream.options & MAD_OPTION_HALFSAMPLERATE ? 16 : 32); (mad->stream.options & MAD_OPTION_HALFSAMPLERATE ? 16 : 32);
#if MAD_VERSION_MINOR <= 12
rate = mad->header.sfreq;
#else
rate = mad->frame.header.samplerate;
#endif
/* at this point we can accept seek events */ /* at this point we can accept seek events */
mad->can_seek = TRUE; mad->can_seek = TRUE;
gst_mad_update_info (mad); gst_mad_update_info (mad);
if (mad->caps_set == FALSE) { if (mad->channels != nchannels || mad->rate != rate) {
#if MAD_VERSION_MINOR <= 12
gint rate = mad->header.sfreq;
#else
gint rate = mad->frame.header.samplerate;
#endif
if (mad->stream.options & MAD_OPTION_HALFSAMPLERATE) if (mad->stream.options & MAD_OPTION_HALFSAMPLERATE)
rate >>=1; rate >>=1;
@ -1087,7 +1090,8 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
gst_element_error (GST_ELEMENT (mad), "could not set caps on source pad, aborting..."); gst_element_error (GST_ELEMENT (mad), "could not set caps on source pad, aborting...");
return; return;
} }
mad->caps_set = TRUE; mad->channels = nchannels;
mad->rate = rate;
} }
if (GST_PAD_IS_CONNECTED (mad->srcpad)) { if (GST_PAD_IS_CONNECTED (mad->srcpad)) {
@ -1179,7 +1183,8 @@ gst_mad_change_state (GstElement *element)
mad->tempsize = 0; mad->tempsize = 0;
mad->can_seek = FALSE; mad->can_seek = FALSE;
mad->total_samples = 0; mad->total_samples = 0;
mad->caps_set = FALSE; mad->rate = 0;
mad->channels = 0;
mad->vbr_average = 0; mad->vbr_average = 0;
mad->frame.header.samplerate = 0; mad->frame.header.samplerate = 0;
if (mad->ignore_crc) options |= MAD_OPTION_IGNORECRC; if (mad->ignore_crc) options |= MAD_OPTION_IGNORECRC;