Skip to content
Snippets Groups Projects
Commit 70ec47c1 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

* #6612 : template speex codecs 

Move all the code in a single .h file
parent 47e1c4b4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-common/src/audio/codecs/Makefile.am
+ 1
− 1
View file @ 70ec47c1
...@@ -66,7 +66,7 @@ endif ...@@ -66,7 +66,7 @@ endif
noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so libcodec_g722.so $(GSM_LIB) $(SPEEX_NB_LIB) $(SPEEX_WB_LIB) $(SPEEX_UB_LIB) $(CELT_LIB) noinst_PROGRAMS = libcodec_ulaw.so libcodec_alaw.so libcodec_g722.so $(GSM_LIB) $(SPEEX_NB_LIB) $(SPEEX_WB_LIB) $(SPEEX_UB_LIB) $(CELT_LIB)
noinst_HEADERS = audiocodec.h audiocodecfactory.h noinst_HEADERS = audiocodec.h audiocodecfactory.h speexcodec.h
libcodec_ulaw_so_SOURCES = ulaw.cpp libcodec_ulaw_so_SOURCES = ulaw.cpp
libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall libcodec_ulaw_so_CFLAGS = -fPIC -g -Wall
......
sflphone-common/src/audio/codecs/speexcodec.h 0 → 100644
+ 127
− 0
View file @ 70ec47c1
/*
* Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010, 2011 Savoir-Faire Linux Inc.
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#include "global.h"
#include "audiocodec.h"
#include <cstdio>
#include <speex/speex.h>
#include <cassert>
static const unsigned int clockRate [3] = {
8000,
16000,
32000
};
static const unsigned int frameSize[3] = {
160,
320,
640,
};
static const unsigned int bitRate[3] = { // FIXME : not using VBR?
24,
42,
0,
};
static const bool dynamicPayload[3] = {
true,
false,
true,
};
const SpeexMode* speexMode[3] = {
&speex_nb_mode,
&speex_wb_mode,
&speex_uwb_mode, // wb
};
class Speex : public sfl::AudioCodec
{
public:
Speex (int payload) : sfl::AudioCodec (payload, "speex")
{
assert(payload >= 110 && payload <= 112);
assert(110 == PAYLOAD_CODEC_SPEEX_8000 &&
111 == PAYLOAD_CODEC_SPEEX_16000 &&
112 == PAYLOAD_CODEC_SPEEX_32000);
int type = payload - 110;
_clockRate = clockRate[type];
_frameSize = frameSize[type];
_channel = 1;
_bitrate = bitRate[type];
_hasDynamicPayload = dynamicPayload[type];
// Init the decoder struct
speex_bits_init (&_speex_dec_bits);
_speex_dec_state = speex_decoder_init (speexMode[type]);
// Init the encoder struct
speex_bits_init (&_speex_enc_bits);
_speex_enc_state = speex_encoder_init (speexMode[type]);
speex_encoder_ctl (_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
speex_decoder_ctl (_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
}
Speex (const Speex&);
Speex& operator= (const Speex&);
~Speex() {
// Destroy the decoder struct
speex_bits_destroy (&_speex_dec_bits);
speex_decoder_destroy (_speex_dec_state);
_speex_dec_state = 0;
// Destroy the encoder struct
speex_bits_destroy (&_speex_enc_bits);
speex_encoder_destroy (_speex_enc_state);
_speex_enc_state = 0;
}
virtual int decode (short *dst, unsigned char *src, size_t buf_size) {
speex_bits_read_from (&_speex_dec_bits, (char*) src, buf_size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
return _frameSize;
}
virtual int encode (unsigned char *dst, short *src, size_t buf_size) {
speex_bits_reset (&_speex_enc_bits);
speex_encode_int (_speex_enc_state, src, &_speex_enc_bits);
return speex_bits_write (&_speex_enc_bits, (char*) dst, buf_size);
}
private:
SpeexBits _speex_dec_bits;
SpeexBits _speex_enc_bits;
void *_speex_dec_state;
void *_speex_enc_state;
int _speex_frame_size;
};
sflphone-common/src/audio/codecs/speexcodec_nb.cpp
+ 1
− 85
View file @ 70ec47c1
...@@ -30,92 +30,8 @@ ...@@ -30,92 +30,8 @@
*/ */
#include "audiocodec.h" #include "audiocodec.h"
#include <cstdio> #include "speexcodec.h"
#include <speex/speex.h>
#include <speex/speex_preprocess.h>
class Speex : public sfl::AudioCodec
{
public:
Speex (int payload=110)
: sfl::AudioCodec (payload, "speex"),
_speexModePtr (NULL),
_speex_dec_bits(),
_speex_enc_bits(),
_speex_dec_state(),
_speex_enc_state(),
_speex_frame_size() {
_clockRate = 8000;
_frameSize = 160; // samples, 20 ms at 8kHz
_channel = 1;
_bitrate = 24;
_hasDynamicPayload = true;
initSpeex();
}
Speex (const Speex&);
Speex& operator= (const Speex&);
void initSpeex() {
// 8000 HZ --> Narrow-band mode
// TODO Manage the other modes
_speexModePtr = &speex_nb_mode;
// _speexModePtr = &speex_wb_mode;
// Init the decoder struct
speex_bits_init (&_speex_dec_bits);
_speex_dec_state = speex_decoder_init (_speexModePtr);
// Init the encoder struct
speex_bits_init (&_speex_enc_bits);
_speex_enc_state = speex_encoder_init (_speexModePtr);
speex_encoder_ctl (_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
speex_decoder_ctl (_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
}
~Speex() {
terminateSpeex();
}
void terminateSpeex() {
// Destroy the decoder struct
speex_bits_destroy (&_speex_dec_bits);
speex_decoder_destroy (_speex_dec_state);
_speex_dec_state = 0;
// Destroy the encoder struct
speex_bits_destroy (&_speex_enc_bits);
speex_encoder_destroy (_speex_enc_state);
_speex_enc_state = 0;
}
virtual int decode (short *dst, unsigned char *src, size_t buf_size) {
speex_bits_read_from (&_speex_dec_bits, (char*) src, buf_size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
return _frameSize;
}
virtual int encode (unsigned char *dst, short *src, size_t buf_size) {
speex_bits_reset (&_speex_enc_bits);
speex_encode_int (_speex_enc_state, src, &_speex_enc_bits);
return speex_bits_write (&_speex_enc_bits, (char*) dst, buf_size);
}
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
SpeexBits _speex_enc_bits;
void *_speex_dec_state;
void *_speex_enc_state;
int _speex_frame_size;
};
// the class factories
extern "C" sfl::Codec* create() extern "C" sfl::Codec* create()
{ {
return new Speex (110); return new Speex (110);
......
sflphone-common/src/audio/codecs/speexcodec_ub.cpp
+ 1
− 87
View file @ 70ec47c1
...@@ -30,94 +30,8 @@ ...@@ -30,94 +30,8 @@
*/ */
#include "audiocodec.h" #include "audiocodec.h"
#include <cstdio> #include "speexcodec.h"
#include <speex/speex.h>
class Speex : public sfl::AudioCodec
{
public:
Speex (int payload=112)
: sfl::AudioCodec (payload, "speex"),
_speexModePtr (NULL),
_speex_dec_bits(),
_speex_enc_bits(),
_speex_dec_state(),
_speex_enc_state(),
_speex_frame_size() {
_clockRate = 32000;
_frameSize = 640; // 20 ms at 32 kHz
_channel = 1;
_bitrate = 0;
_hasDynamicPayload = true;
initSpeex();
}
Speex (const Speex&);
Speex& operator= (const Speex&);
void initSpeex() {
// int _samplingRate = 32000;
// 8000 HZ --> Narrow-band mode
// TODO Manage the other modes
_speexModePtr = &speex_wb_mode;
// _speexModePtr = &speex_wb_mode;
// Init the decoder struct
speex_bits_init (&_speex_dec_bits);
_speex_dec_state = speex_decoder_init (_speexModePtr);
// Init the encoder struct
speex_bits_init (&_speex_enc_bits);
_speex_enc_state = speex_encoder_init (_speexModePtr);
speex_encoder_ctl (_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
speex_decoder_ctl (_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
}
~Speex() {
terminateSpeex();
}
void terminateSpeex() {
// Destroy the decoder struct
speex_bits_destroy (&_speex_dec_bits);
speex_decoder_destroy (_speex_dec_state);
_speex_dec_state = 0;
// Destroy the encoder struct
speex_bits_destroy (&_speex_enc_bits);
speex_encoder_destroy (_speex_enc_state);
_speex_enc_state = 0;
}
virtual int decode (short *dst, unsigned char *src, size_t buf_size) {
speex_bits_read_from (&_speex_dec_bits, (char*) src, buf_size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
return _frameSize;
}
virtual int encode (unsigned char *dst, short *src, size_t buf_size) {
speex_bits_reset (&_speex_enc_bits);
speex_encode_int (_speex_enc_state, src, &_speex_enc_bits);
speex_bits_nbytes (&_speex_enc_bits);
return speex_bits_write (&_speex_enc_bits, (char*) dst, buf_size);
}
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
SpeexBits _speex_enc_bits;
void *_speex_dec_state;
void *_speex_enc_state;
int _speex_frame_size;
};
// the class factories
extern "C" sfl::Codec* create() extern "C" sfl::Codec* create()
{ {
return new Speex (112); return new Speex (112);
......
sflphone-common/src/audio/codecs/speexcodec_wb.cpp
+ 1
− 84
View file @ 70ec47c1
...@@ -30,91 +30,8 @@ ...@@ -30,91 +30,8 @@
*/ */
#include "audiocodec.h" #include "audiocodec.h"
#include <cstdio> #include "speexcodec.h"
#include <speex/speex.h>
class Speex : public sfl::AudioCodec
{
public:
Speex (int payload=111)
: sfl::AudioCodec (payload, "speex"),
_speexModePtr (NULL),
_speex_dec_bits(),
_speex_enc_bits(),
_speex_dec_state(),
_speex_enc_state(),
_speex_frame_size() {
_clockRate = 16000;
_frameSize = 320; // 20 ms at 16 kHz
_channel = 1;
_bitrate = 42;
initSpeex();
}
Speex (const Speex&);
Speex& operator= (const Speex&);
void initSpeex() {
// 8000 HZ --> Narrow-band mode
// TODO Manage the other modes
_speexModePtr = &speex_wb_mode;
// _speexModePtr = &speex_wb_mode;
// Init the decoder struct
speex_bits_init (&_speex_dec_bits);
_speex_dec_state = speex_decoder_init (_speexModePtr);
// Init the encoder struct
speex_bits_init (&_speex_enc_bits);
_speex_enc_state = speex_encoder_init (_speexModePtr);
speex_encoder_ctl (_speex_enc_state,SPEEX_SET_SAMPLING_RATE,&_clockRate);
speex_decoder_ctl (_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
}
~Speex() {
terminateSpeex();
}
void terminateSpeex() {
// Destroy the decoder struct
speex_bits_destroy (&_speex_dec_bits);
speex_decoder_destroy (_speex_dec_state);
_speex_dec_state = 0;
// Destroy the encoder struct
speex_bits_destroy (&_speex_enc_bits);
speex_encoder_destroy (_speex_enc_state);
_speex_enc_state = 0;
}
virtual int decode (short *dst, unsigned char *src, size_t buf_size) {
speex_bits_read_from (&_speex_dec_bits, (char*) src, buf_size);
speex_decode_int (_speex_dec_state, &_speex_dec_bits, dst);
return _frameSize;
}
virtual int encode (unsigned char *dst, short *src, size_t buf_size) {
speex_bits_reset (&_speex_enc_bits);
speex_encode_int (_speex_enc_state, src, &_speex_enc_bits);
return speex_bits_write (&_speex_enc_bits, (char*) dst, buf_size);
}
private:
const SpeexMode* _speexModePtr;
SpeexBits _speex_dec_bits;
SpeexBits _speex_enc_bits;
void *_speex_dec_state;
void *_speex_enc_state;
int _speex_frame_size;
};
// the class factories
extern "C" sfl::Codec* create() extern "C" sfl::Codec* create()
{ {
return new Speex (111); return new Speex (111);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment