diff --git a/src/audio/codecs/celtcodec.cpp b/src/audio/codecs/celtcodec.cpp
deleted file mode 100644
index 3dc61c7c2b9a09b4b70302da013d269c3d773501..0000000000000000000000000000000000000000
--- a/src/audio/codecs/celtcodec.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2007-2009 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.
- */
-
-#include "audiocodec.h"
-#include <cstdio>
-#include <celt/celt.h>
-
-
-class Celt : public AudioCodec{
- public:
- Celt(int payload=0)
- : AudioCodec(payload, "celt"),
- _celt_frame_size(128)
- {
- _clockRate = 44100;
- _channel = 1;
- _bitrate = 0;
- _bandwidth = 0;
- initCelt();
- }
-
- Celt( const Celt& );
- Celt& operator=(const Celt&);
-
- void initCelt() {
- printf("init celt");
-
- mode = celt_mode_create(_clockRate, _channel, _celt_frame_size, NULL);
- // celt_mode_info(mode, CELT_GET_LOOKAHEAD, &skip);
-
- if (mode == NULL)
- {
- printf("failed to create a mode\n");
- }
-
- // bytes_per_packet = 1024;
- // if (bytes_per_packet < 0 || bytes_per_packet > MAX_PACKET)
- // {
- // printf ("bytes per packet must be between 0 and %d\n");
- // }
-
- // celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size);
- // celt_mode_info(mode, CELT_GET_NB_CHANNELS, &_channel);
-
- enc = celt_encoder_create(mode);
- dec = celt_decoder_create(mode);
-
- }
-
- ~Celt()
- {
- terminateCelt();
- }
-
- void terminateCelt() {
-
- celt_encoder_destroy(enc);
- celt_decoder_destroy(dec);
- }
-
- virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
- {
- int len = 0;
- len = celt_decode(dec, src, size, (celt_int16_t*)dst);
- return len;
- }
-
- virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
- {
- int len = 0;
- len = celt_encode(enc, (celt_int16_t *)src, NULL, dst, size);
- return len;
- }
-
- private:
-
- CELTMode *mode;
-
- CELTEncoder *enc;
- CELTDecoder *dec;
-
- celt_int32_t _celt_frame_size;
- celt_int32_t skip;
-
-};
-
-// the class factories
-extern "C" AudioCodec* create() {
- return new Celt(115);
-}
-
-extern "C" void destroy(AudioCodec* a) {
- delete a;
-}
-
diff --git a/src/audio/codecs/speexcodec_nb.cpp b/src/audio/codecs/speexcodec_nb.cpp
deleted file mode 100644
index 72b3c36d0dadff319f236358b05be1e389f49ca4..0000000000000000000000000000000000000000
--- a/src/audio/codecs/speexcodec_nb.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2007-2009 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.
- */
-
-#include "audiocodec.h"
-#include <cstdio>
-#include <speex/speex.h>
-#include <speex/speex_preprocess.h>
-
-class Speex : public AudioCodec{
- public:
- Speex(int payload=0)
- : AudioCodec(payload, "speex"),
- _speexModePtr(NULL),
- _speex_dec_bits(),
- _speex_enc_bits(),
- _speex_dec_state(),
- _speex_enc_state(),
- _speex_frame_size(),
- _preprocess_state()
- {
- _clockRate = 8000;
- _channel = 1;
- _bitrate = 0;
- _bandwidth = 0;
- initSpeex();
- }
-
- Speex( const Speex& );
- Speex& operator=(const Speex&);
-
- void initSpeex() {
-
- int _samplingRate = 8000;
-
- // 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);
-
-#ifdef HAVE_SPEEXDSP_LIB
-
- int enable = 1;
- int quality = 10;
- int complex = 10;
- int attenuation = -10;
-
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VAD, &enable);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_DTX, &enable);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VBR_QUALITY, &quality);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_COMPLEXITY, &complex);
-
- // Init the decoder struct
- speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
-
- // Init the preprocess struct
- _preprocess_state = speex_preprocess_state_init(_speex_frame_size,_clockRate);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_DENOISE, &enable);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &attenuation);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
-#endif
-
- }
-
- ~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 codecDecode (short *dst, unsigned char *src, unsigned int size)
- {
-
- int ratio = 320 / _speex_frame_size;
- speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
- speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
-
- return _speex_frame_size * ratio;
- }
-
- virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
- {
- speex_bits_reset(&_speex_enc_bits);
-
-#ifdef HAVE_SPEEXDSP_LIB
-
- speex_preprocess_run(_preprocess_state, src);
-#endif
-
- speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
- int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
- printf("Codec::codecEncode() nbBytes: %i \n",nbBytes);
- return nbBytes;
- }
-
- private:
- const SpeexMode* _speexModePtr;
- SpeexBits _speex_dec_bits;
- SpeexBits _speex_enc_bits;
- void *_speex_dec_state;
- void *_speex_enc_state;
- int _speex_frame_size;
- SpeexPreprocessState *_preprocess_state;
-};
-
-// the class factories
-extern "C" AudioCodec* create() {
- return new Speex(110);
-}
-
-extern "C" void destroy(AudioCodec* a) {
- delete a;
-}
-
diff --git a/src/audio/codecs/speexcodec_wb.cpp b/src/audio/codecs/speexcodec_wb.cpp
deleted file mode 100644
index e86b3d724ef7b21040f7da61af96461fbd899685..0000000000000000000000000000000000000000
--- a/src/audio/codecs/speexcodec_wb.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2007-2009 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.
- */
-
-#include "audiocodec.h"
-#include <cstdio>
-#include <speex/speex.h>
-#include <speex/speex_preprocess.h>
-
-class Speex : public AudioCodec{
- public:
- Speex(int payload=0)
- : AudioCodec(payload, "speex"),
- _speexModePtr(NULL),
- _speex_dec_bits(),
- _speex_enc_bits(),
- _speex_dec_state(),
- _speex_enc_state(),
- _speex_frame_size(),
- _preprocess_state()
- {
- _clockRate = 16000;
- _channel = 1;
- _bitrate = 0;
- _bandwidth = 0;
- initSpeex();
- }
-
- Speex( const Speex& );
- Speex& operator=(const Speex&);
-
- void initSpeex() {
-
- int _samplingRate = 16000;
-
- // 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);
-
-#ifdef HAVE_SPEEXDSP_LIB
-
- int enable = 1;
- int quality = 10;
- int complex = 10;
- int attenuation = -10;
-
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VAD, &enable);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_DTX, &enable);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_VBR_QUALITY, &quality);
- speex_encoder_ctl(_speex_enc_state, SPEEX_SET_COMPLEXITY, &complex);
-
- // Init the decoder struct
- speex_decoder_ctl(_speex_dec_state, SPEEX_GET_FRAME_SIZE, &_speex_frame_size);
-
- // Init the preprocess struct
- _preprocess_state = speex_preprocess_state_init(_speex_frame_size,_clockRate);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_DENOISE, &enable);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_NOISE_SUPPRESS, &attenuation);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_VAD, &enable);
- speex_preprocess_ctl(_preprocess_state, SPEEX_PREPROCESS_SET_AGC, &enable);
-#endif
-
- }
-
- ~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 codecDecode (short *dst, unsigned char *src, unsigned int size)
- {
-
- int ratio = 320 / _speex_frame_size;
- speex_bits_read_from(&_speex_dec_bits, (char*)src, size);
- speex_decode_int(_speex_dec_state, &_speex_dec_bits, dst);
-
- return 2 * _speex_frame_size * ratio;
- }
-
- virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
- {
- speex_bits_reset(&_speex_enc_bits);
-
-#ifdef HAVE_SPEEXDSP_LIB
-
- speex_preprocess_run(_preprocess_state, src);
-#endif
-
- speex_encode_int(_speex_enc_state, src, &_speex_enc_bits);
- int nbBytes = speex_bits_write(&_speex_enc_bits, (char*)dst, size);
- printf("Codec::codecEncode() nbBytes: %i \n",nbBytes);
- return nbBytes;
- }
-
- private:
- const SpeexMode* _speexModePtr;
- SpeexBits _speex_dec_bits;
- SpeexBits _speex_enc_bits;
- void *_speex_dec_state;
- void *_speex_enc_state;
- int _speex_frame_size;
- SpeexPreprocessState *_preprocess_state;
-};
-
-// the class factories
-extern "C" AudioCodec* create() {
- return new Speex(111);
-}
-
-extern "C" void destroy(AudioCodec* a) {
- delete a;
-}
-
diff --git a/src/audio/codecs/vorbiscodec.cpp b/src/audio/codecs/vorbiscodec.cpp
deleted file mode 100644
index 2395fa2d200bd958c6997a7db60f05741be336bd..0000000000000000000000000000000000000000
--- a/src/audio/codecs/vorbiscodec.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2007-2009 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.
- */
-
-#include "audiocodec.h"
-#include <cstdio>
-#include <math.h>
-#include <vorbis/vorbis.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-class Vorbis : public AudioCodec{
- public:
- Vorbis(int payload=0)
- : AudioCodec(payload, "vorbis"),
- _ogg_stream_state(),
- _ogg_packet(),
- _vorbis_info(),
- _vorbis_comment(),
- _vorbis_dsp_state(),
- _vorbis_block()
- {
- _clockRate = 8000;
- _channel = 1;
- _bitrate = 0;
- _bandwidth = 0;
- initVorbis();
- }
-
- Vorbis( const Vorbis& );
- Vorbis& operator=(const Vorbis&);
-
- void initVorbis() {
-
- // init the encoder
- vorbis_info_init(&_vorbis_info);
- vorbis_encode_init_vbr(&_vorbis_info,0.5);
-
- vorbis_comment_init(&_vorbis_comment);
-
- vorbis_analysis_init(&_vorbis_dsp_state, &_vorbis_info);
-
- // random number for ogg serial number
- srand(time(NULL));
-
- }
-
- ~Vorbis()
- {
- terminateVorbis();
- }
-
- void terminateVorbis() {
-
- vorbis_block_clear(&_vorbis_block);
- vorbis_dsp_clear(&_vorbis_dsp_state);
- vorbis_comment_clear(&_vorbis_comment);
- vorbis_info_clear(&_vorbis_info);
- }
-
- virtual int codecDecode (short *dst, unsigned char *src, unsigned int size)
- {
-
-
- return 1;
- }
-
- virtual int codecEncode (unsigned char *dst, short *src, unsigned int size)
- {
-
- return 1;
- }
-
- private:
-
- // ogg-vorbis specific variables
- ogg_sync_state oy;
-
- ogg_stream_state _ogg_stream_state;
-
- ogg_packet _ogg_packet;
-
- vorbis_info _vorbis_info;
-
- vorbis_comment _vorbis_comment;
-
- vorbis_dsp_state _vorbis_dsp_state;
-
- vorbis_block _vorbis_block;
-
-
-};
-
-// the class factories
-extern "C" AudioCodec* create() {
- return new Vorbis(117);
-}
-
-extern "C" void destroy(AudioCodec* a) {
- delete a;
-}
-