mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

wavparse fixups

Browse source 
Original commit message from CVS:
wavparse fixups
This commit is contained in:
Andy Wingo 2002-05-30 04:43:38 +00:00
parent b1bb03e1a8
commit 22c7be80df
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/wavparse/gstwavparse.c
View file

@ -192,6 +192,10 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
/* I suppose we could signal an EOF at this point, but that may be /* I suppose we could signal an EOF at this point, but that may be
premature. We've stopped data flow, that's the main thing. */ premature. We've stopped data flow, that's the main thing. */
} }
GST_BUFFER_TIMESTAMP (buf) = wavparse->offset * GST_SECOND / wavparse->rate;
wavparse->offset += GST_BUFFER_SIZE (buf) * 8 / wavparse->width / wavparse->channels;
gst_pad_push (wavparse->srcpad, buf); gst_pad_push (wavparse->srcpad, buf);
return; return;
} }
@ -271,9 +275,16 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
"channels", GST_PROPS_INT (format->wChannels) "channels", GST_PROPS_INT (format->wChannels)
); );
gst_pad_try_set_caps (wavparse->srcpad, caps); if (!gst_pad_try_set_caps (wavparse->srcpad, caps)) {
gst_element_error (GST_ELEMENT (wavparse), "Could not set caps");
return;
}
wavparse->bps = format->wBlockAlign; wavparse->bps = format->wBlockAlign;
wavparse->rate = format->dwSamplesPerSec;
wavparse->channels = format->wChannels;
wavparse->width = format->wBitsPerSample;
GST_DEBUG (0, "frequency %d, channels %d", GST_DEBUG (0, "frequency %d, channels %d",
format->dwSamplesPerSec, format->wChannels); format->dwSamplesPerSec, format->wChannels);
@ -316,6 +327,8 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf)
newbuf = gst_buffer_new (); newbuf = gst_buffer_new ();
GST_BUFFER_DATA (newbuf) = g_malloc (subsize); GST_BUFFER_DATA (newbuf) = g_malloc (subsize);
GST_BUFFER_SIZE (newbuf) = subsize; GST_BUFFER_SIZE (newbuf) = subsize;
GST_BUFFER_TIMESTAMP (newbuf) = wavparse->offset * GST_SECOND / wavparse->rate;
wavparse->offset += subsize * 8 / wavparse->width / wavparse->channels;
memcpy (GST_BUFFER_DATA (newbuf), GST_BUFFER_DATA (buf) + datachunk->offset, subsize); memcpy (GST_BUFFER_DATA (newbuf), GST_BUFFER_DATA (buf) + datachunk->offset, subsize);

4
gst/wavparse/gstwavparse.h
View file

@ -71,7 +71,11 @@ struct _GstWavParse {
/* useful audio data */ /* useful audio data */
gint bps; gint bps;
gint rate;
gint channels;
gint width;
gint64 offset;
}; };
struct _GstWavParseClass { struct _GstWavParseClass {