mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/wavenc/: Add support for a-law and mu-law encoded wav files. Fixes bug #562434.

Browse source 
Original commit message from CVS:
Patch by: Pepijn Van Eeckhoudt
<pepijn dot vaneeckhoudt at luciad dot com>
* gst/wavenc/gstwavenc.c: (gst_wavenc_create_header_buf),
(gst_wavenc_sink_setcaps), (gst_wavenc_change_state):
* gst/wavenc/gstwavenc.h:
* gst/wavenc/riff.h:
Add support for a-law and mu-law encoded wav files. Fixes bug #562434.
This commit is contained in:
Sebastian Dröge 2008-11-27 12:13:39 +00:00
parent 42f6a2bca1
commit 3f39ed1a0c
4 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-11-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Pepijn Van Eeckhoudt
<pepijn dot vaneeckhoudt at luciad dot com>
* gst/wavenc/gstwavenc.c: (gst_wavenc_create_header_buf),
(gst_wavenc_sink_setcaps), (gst_wavenc_change_state):
* gst/wavenc/gstwavenc.h:
* gst/wavenc/riff.h:
Add support for a-law and mu-law encoded wav files. Fixes bug #562434.
2008-11-27 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: 이문형 <iwings at gmail dot com>

59
gst/wavenc/gstwavenc.c
View file

@ -31,9 +31,6 @@
GST_DEBUG_CATEGORY_STATIC (wavenc_debug);
#define GST_CAT_DEFAULT wavenc_debug
#define WAVE_FORMAT_PCM 0x0001
#define WAVE_FORMAT_FLOAT 0x0003
struct riff_struct
{
guint8 id[4]; /* RIFF */
@ -110,7 +107,20 @@ GST_ELEMENT_DETAILS ("WAV audio muxer",
"rate = (int) [ 1, MAX ], " \
"channels = (int) [ 1, 2 ], " \
"endianness = (int) LITTLE_ENDIAN, " \
"width = (int) { 32, 64 } "
"width = (int) { 32, 64 }; " \
"audio/x-alaw, " \
"rate = (int) [ 8000, 192000 ], " \
"channels = (int) [ 1, 2 ], " \
"width = (int) 8, " \
"depth = (int) 8, " \
"signed = (boolean) false; " \
"audio/x-mulaw, " \
"rate = (int) [ 8000, 192000 ], " \
"channels = (int) [ 1, 2 ], " \
"width = (int) 8, " \
"depth = (int) 8, " \
"signed = (boolean) false"
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
@ -201,7 +211,7 @@ gst_wavenc_create_header_buf (GstWavEnc * wavenc, guint audio_data_size)
memcpy (wave.format.id, "fmt ", 4);
wave.format.len = 16;
wave.common.wFormatTag = (wavenc->fp) ? WAVE_FORMAT_FLOAT : WAVE_FORMAT_PCM;
wave.common.wFormatTag = wavenc->format;
wave.common.wBlockAlign = (wavenc->width / 8) * wave.common.wChannels;
wave.common.dwAvgBytesPerSec =
wave.common.wBlockAlign * wave.common.dwSamplesPerSec;
@ -259,6 +269,7 @@ gst_wavenc_sink_setcaps (GstPad * pad, GstCaps * caps)
{
GstWavEnc *wavenc;
GstStructure *structure;
const gchar *name;
gint chans, rate, width;
wavenc = GST_WAVENC (gst_pad_get_parent (pad));
@ -271,23 +282,45 @@ gst_wavenc_sink_setcaps (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (wavenc, "got caps: %" GST_PTR_FORMAT, caps);
structure = gst_caps_get_structure (caps, 0);
name = gst_structure_get_name (structure);
if (!gst_structure_get_int (structure, "channels", &chans) ||
!gst_structure_get_int (structure, "rate", &rate) ||
!gst_structure_get_int (structure, "width", &width)) {
!gst_structure_get_int (structure, "rate", &rate)) {
GST_WARNING_OBJECT (wavenc, "caps incomplete");
goto fail;
}
wavenc->fp =
(g_str_equal (gst_structure_get_name (structure), "audio/x-raw-float"));
if (strcmp (name, "audio/x-raw-int") == 0) {
if (!gst_structure_get_int (structure, "width", &width)) {
GST_WARNING_OBJECT (wavenc, "caps incomplete");
goto fail;
}
wavenc->format = GST_RIFF_WAVE_FORMAT_PCM;
wavenc->width = width;
} else if (strcmp (name, "audio/x-raw-float") == 0) {
if (!gst_structure_get_int (structure, "width", &width)) {
GST_WARNING_OBJECT (wavenc, "caps incomplete");
goto fail;
}
wavenc->format = GST_RIFF_WAVE_FORMAT_FLOAT;
wavenc->width = width;
} else if (strcmp (name, "audio/x-alaw") == 0) {
wavenc->format = GST_RIFF_WAVE_FORMAT_ALAW;
wavenc->width = 8;
} else if (strcmp (name, "audio/x-mulaw") == 0) {
wavenc->format = GST_RIFF_WAVE_FORMAT_MULAW;
wavenc->width = 8;
} else {
GST_WARNING_OBJECT (wavenc, "Unsupported format %s", name);
goto fail;
}
wavenc->channels = chans;
wavenc->width = width;
wavenc->rate = rate;
GST_LOG_OBJECT (wavenc,
"accepted caps: chans=%u width=%u rate=%u floating point=%d",
wavenc->channels, wavenc->width, wavenc->rate, wavenc->fp);
"accepted caps: format=0x%04x chans=%u width=%u rate=%u",
wavenc->format, wavenc->channels, wavenc->width, wavenc->rate);
gst_object_unref (wavenc);
return TRUE;
@ -661,11 +694,11 @@ gst_wavenc_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
wavenc->format = 0;
wavenc->channels = 0;
wavenc->width = 0;
wavenc->rate = 0;
wavenc->length = 0;
wavenc->fp = FALSE;
wavenc->sent_header = FALSE;
break;
default:

2
gst/wavenc/gstwavenc.h
View file

@ -47,11 +47,11 @@ struct _GstWavEnc {
GstPad *srcpad;
/* useful audio data */
guint16 format;
guint width;
guint rate;
guint channels;
guint32 length;
gboolean fp;
gboolean sent_header;
};

1
gst/wavenc/riff.h
View file

@ -300,6 +300,7 @@ struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_WAVE_FORMAT_UNKNOWN (0x0000)
#define GST_RIFF_WAVE_FORMAT_PCM (0x0001)
#define GST_RIFF_WAVE_FORMAT_ADPCM (0x0002)
#define GST_RIFF_WAVE_FORMAT_FLOAT (0x0003)
#define GST_RIFF_WAVE_FORMAT_IBM_CVSD (0x0005)
#define GST_RIFF_WAVE_FORMAT_ALAW (0x0006)
#define GST_RIFF_WAVE_FORMAT_MULAW (0x0007)