[xiph-commits] r10671 - in trunk/speex: include/speex libspeex
jm at svn.xiph.org
jm at svn.xiph.org
Wed Dec 21 19:47:30 PST 2005
Author: jm
Date: 2005-12-21 19:47:25 -0800 (Wed, 21 Dec 2005)
New Revision: 10671
Added:
trunk/speex/include/speex/pcm_wrapper.h
trunk/speex/libspeex/pcm_wrapper.c
Modified:
trunk/speex/include/speex/Makefile.am
trunk/speex/libspeex/Makefile.am
Log:
Can now encode PCM with libspeex.
Modified: trunk/speex/include/speex/Makefile.am
===================================================================
--- trunk/speex/include/speex/Makefile.am 2005-12-21 08:32:19 UTC (rev 10670)
+++ trunk/speex/include/speex/Makefile.am 2005-12-22 03:47:25 UTC (rev 10671)
@@ -11,5 +11,6 @@
speex_stereo.h \
speex_preprocess.h \
speex_jitter.h \
- speex_echo.h
+ speex_echo.h \
+ pcm_wrapper.h
Added: trunk/speex/include/speex/pcm_wrapper.h
===================================================================
--- trunk/speex/include/speex/pcm_wrapper.h 2005-12-21 08:32:19 UTC (rev 10670)
+++ trunk/speex/include/speex/pcm_wrapper.h 2005-12-22 03:47:25 UTC (rev 10671)
@@ -0,0 +1,62 @@
+/* Copyright (C) 2005 Jean-Marc Valin */
+/**
+ @file pcm_wrapper.h
+ @brief PCM encoding wrapped as a Speex mode
+ */
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+
+#ifndef PCM_WRAPPER_H
+#define PCM_WRAPPER_H
+
+#include "speex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PCM_SET_FRAME_SIZE 2
+#define PCM_GET_FRAME_SIZE 3
+
+#define PCM_SET_FORMAT 2000
+#define PCM_GET_FORMAT 2001
+
+/** PCM wrapper mode */
+extern const SpeexMode *speex_pcm_wrapper;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif
Modified: trunk/speex/libspeex/Makefile.am
===================================================================
--- trunk/speex/libspeex/Makefile.am 2005-12-21 08:32:19 UTC (rev 10670)
+++ trunk/speex/libspeex/Makefile.am 2005-12-22 03:47:25 UTC (rev 10671)
@@ -16,7 +16,7 @@
exc_10_16_table.c exc_20_32_table.c hexc_10_32_table.c misc.c speex_header.c \
speex_callbacks.c math_approx.c stereo.c preprocess.c smallft.c lbr_48k_tables.c \
jitter.c mdf.c vorbis_psy.c fftwrap.c kiss_fft.c _kiss_fft_guts.h kiss_fft.h \
- kiss_fftr.c kiss_fftr.h
+ kiss_fftr.c kiss_fftr.h pcm_wrapper.c
noinst_HEADERS = lsp.h nb_celp.h lpc.h lpc_bfin.h ltp.h quant_lsp.h \
cb_search.h filters.h stack_alloc.h vq.h vq_sse.h vq_arm4.h vq_bfin.h \
Added: trunk/speex/libspeex/pcm_wrapper.c
===================================================================
--- trunk/speex/libspeex/pcm_wrapper.c 2005-12-21 08:32:19 UTC (rev 10670)
+++ trunk/speex/libspeex/pcm_wrapper.c 2005-12-22 03:47:25 UTC (rev 10671)
@@ -0,0 +1,180 @@
+/* Copyright (C) 2005 Jean-Marc Valin */
+/**
+ @file pcm_wrapper.c
+ @brief PCM encoding wrapped as a Speex mode
+ */
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "speex/pcm_wrapper.h"
+#include "misc.h"
+
+
+typedef struct {
+ const SpeexMode *mode;
+ int frame_size;
+ int format;
+} PCMState;
+
+/** Initializes encoder state*/
+static void *pcm_encoder_init(const SpeexMode *m)
+{
+ PCMState *st = (PCMState*)speex_alloc(sizeof(PCMState));
+ st->mode = m;
+ st->frame_size = 64;
+
+}
+
+/** De-allocates encoder state resources*/
+static void pcm_encoder_destroy(void *state)
+{
+ speex_free(state);
+}
+
+/** Encodes one frame*/
+static int pcm_encode(void *state, void *vin, SpeexBits *bits)
+{
+ int i;
+ PCMState *st = (PCMState*)state;
+ spx_word16_t *in = vin;
+ for (i=0;i<st->frame_size;i++)
+ {
+ spx_int16_t x;
+ x = in[i];
+ speex_bits_pack(bits, x, 16);
+ }
+}
+
+/** Initializes decoder state*/
+static void *pcm_decoder_init(const SpeexMode *m)
+{
+ PCMState *st = (PCMState*)speex_alloc(sizeof(PCMState));
+ st->mode = m;
+ st->frame_size = 64;
+}
+
+/** De-allocates decoder state resources*/
+static void pcm_decoder_destroy(void *state)
+{
+ speex_free(state);
+}
+
+/** Decodes one frame*/
+static int pcm_decode(void *state, SpeexBits *bits, void *vout)
+{
+ int i;
+ PCMState *st = (PCMState*)state;
+ spx_word16_t *out = vout;
+ for (i=0;i<st->frame_size;i++)
+ {
+ spx_int16_t x;
+ x = speex_bits_unpack_signed(bits, 16);
+ out[i] = x;
+ }
+}
+
+/** ioctl-like function for controlling a narrowband encoder */
+static int pcm_encoder_ctl(void *state, int request, void *ptr)
+{
+ PCMState *st;
+ st=(PCMState*)state;
+ switch(request)
+ {
+ case PCM_SET_FRAME_SIZE:
+ st->frame_size = (*(int*)ptr);
+ break;
+ case PCM_GET_FRAME_SIZE:
+ (*(int*)ptr) = st->frame_size;
+ break;
+ default:
+ speex_warning_int("Unknown nb_ctl request: ", request);
+ return -1;
+ }
+}
+
+/** ioctl-like function for controlling a narrowband decoder */
+static int pcm_decoder_ctl(void *state, int request, void *ptr)
+{
+ PCMState *st;
+ st=(PCMState*)state;
+ switch(request)
+ {
+ case PCM_SET_FRAME_SIZE:
+ st->frame_size = (*(int*)ptr);
+ break;
+ case PCM_GET_FRAME_SIZE:
+ (*(int*)ptr) = st->frame_size;
+ break;
+ default:
+ speex_warning_int("Unknown nb_ctl request: ", request);
+ return -1;
+
+ }
+}
+
+typedef struct {
+} PCMMode;
+
+static PCMMode pcmmode;
+
+int pcm_mode_query(const void *mode, int request, void *ptr)
+{
+ const PCMMode *m = (const PCMMode*)mode;
+
+ switch (request)
+ {
+ default:
+ speex_warning_int("Unknown nb_mode_query request: ", request);
+ return -1;
+ }
+ return 0;
+}
+/* Default mode for narrowband */
+const SpeexMode pcm_wrapper_mode = {
+ &pcmmode,
+ pcm_mode_query,
+ "PCM",
+ 0,
+ 4,
+ &pcm_encoder_init,
+ &pcm_encoder_destroy,
+ &pcm_encode,
+ &pcm_decoder_init,
+ &pcm_decoder_destroy,
+ &pcm_decode,
+ &pcm_encoder_ctl,
+ &pcm_decoder_ctl,
+};
+
+const SpeexMode *speex_pcm_wrapper = &pcm_wrapper_mode;
\ No newline at end of file
More information about the commits
mailing list