mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-27 00:38:21 +00:00
gst/wavenc/gstwavenc.c: If we're not allowing width!=depth in wavenc we should also disable the code that was added t...
Original commit message from CVS: * gst/wavenc/gstwavenc.c: (gst_wavenc_chain): If we're not allowing width!=depth in wavenc we should also disable the code that was added to support width!=depth.
This commit is contained in:
parent
51cc968198
commit
cbccea33ec
|
@ -1,3 +1,9 @@
|
||||||
|
2008-08-21 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||||
|
|
||||||
|
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain):
|
||||||
|
If we're not allowing width!=depth in wavenc we should also disable
|
||||||
|
the code that was added to support width!=depth.
|
||||||
|
|
||||||
2008-08-21 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
2008-08-21 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
||||||
|
|
||||||
* gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream):
|
* gst/matroska/matroska-demux.c: (gst_matroska_demux_add_stream):
|
||||||
|
|
|
@ -608,6 +608,7 @@ gst_wavenc_event (GstPad * pad, GstEvent * event)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
/* Copied from gst-plugins-base/gst/audioconvert/audioconvert.c */
|
/* Copied from gst-plugins-base/gst/audioconvert/audioconvert.c */
|
||||||
#define READ24_FROM_LE(p) (p[0] | (p[1] << 8) | (p[2] << 16))
|
#define READ24_FROM_LE(p) (p[0] | (p[1] << 8) | (p[2] << 16))
|
||||||
#define WRITE24_TO_LE(p,v) p[0] = v & 0xff; p[1] = (v >> 8) & 0xff; p[2] = (v >> 16) & 0xff
|
#define WRITE24_TO_LE(p,v) p[0] = v & 0xff; p[1] = (v >> 8) & 0xff; p[2] = (v >> 16) & 0xff
|
||||||
|
@ -653,6 +654,7 @@ gst_wavenc_format_samples (GstBuffer * buf, guint width, guint depth)
|
||||||
|
|
||||||
#undef READ24_FROM_LE
|
#undef READ24_FROM_LE
|
||||||
#undef WRITE24_TO_LE
|
#undef WRITE24_TO_LE
|
||||||
|
#endif
|
||||||
|
|
||||||
static GstFlowReturn
|
static GstFlowReturn
|
||||||
gst_wavenc_chain (GstPad * pad, GstBuffer * buf)
|
gst_wavenc_chain (GstPad * pad, GstBuffer * buf)
|
||||||
|
@ -679,12 +681,16 @@ gst_wavenc_chain (GstPad * pad, GstBuffer * buf)
|
||||||
GST_LOG_OBJECT (wavenc, "pushing %u bytes raw audio, ts=%" GST_TIME_FORMAT,
|
GST_LOG_OBJECT (wavenc, "pushing %u bytes raw audio, ts=%" GST_TIME_FORMAT,
|
||||||
GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
|
GST_BUFFER_SIZE (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
|
||||||
|
|
||||||
|
#if 0
|
||||||
if (wavenc->width != wavenc->depth) {
|
if (wavenc->width != wavenc->depth) {
|
||||||
buf = gst_buffer_make_writable (buf);
|
buf = gst_buffer_make_writable (buf);
|
||||||
gst_wavenc_format_samples (buf, wavenc->width, wavenc->depth);
|
gst_wavenc_format_samples (buf, wavenc->width, wavenc->depth);
|
||||||
} else {
|
} else {
|
||||||
|
#endif
|
||||||
buf = gst_buffer_make_metadata_writable (buf);
|
buf = gst_buffer_make_metadata_writable (buf);
|
||||||
|
#if 0
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
gst_buffer_set_caps (buf, GST_PAD_CAPS (wavenc->srcpad));
|
gst_buffer_set_caps (buf, GST_PAD_CAPS (wavenc->srcpad));
|
||||||
GST_BUFFER_OFFSET (buf) = WAV_HEADER_LEN + wavenc->length;
|
GST_BUFFER_OFFSET (buf) = WAV_HEADER_LEN + wavenc->length;
|
||||||
|
|
Loading…
Reference in a new issue