Mercurial > libavcodec.hg
changeset 4551:c0bf618fbe7e libavcodec
Add support for MS-GSM codec
| author | mbardiaux |
|---|---|
| date | Tue, 20 Feb 2007 11:09:47 +0000 |
| parents | 03b09678398d |
| children | c31d78661cf2 |
| files | allcodecs.c avcodec.h libgsm.c |
| diffstat | 3 files changed, 68 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/allcodecs.c Tue Feb 20 10:34:01 2007 +0000 +++ b/allcodecs.c Tue Feb 20 11:09:47 2007 +0000 @@ -168,6 +168,7 @@ REGISTER_DECODER(IMC, imc); REGISTER_DECODER(LIBA52, liba52); REGISTER_ENCDEC (LIBGSM, libgsm); + REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCODER(LIBTHEORA, libtheora); REGISTER_DECODER(MACE3, mace3); REGISTER_DECODER(MACE6, mace6);
--- a/avcodec.h Tue Feb 20 10:34:01 2007 +0000 +++ b/avcodec.h Tue Feb 20 11:09:47 2007 +0000 @@ -37,8 +37,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(33<<8)+0) -#define LIBAVCODEC_VERSION 51.33.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(34<<8)+0) +#define LIBAVCODEC_VERSION 51.34.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -227,7 +227,7 @@ CODEC_ID_SHORTEN, CODEC_ID_ALAC, CODEC_ID_WESTWOOD_SND1, - CODEC_ID_GSM, + CODEC_ID_GSM, /* As in Berlin toast format */ CODEC_ID_QDM2, CODEC_ID_COOK, CODEC_ID_TRUESPEECH, @@ -239,6 +239,7 @@ CODEC_ID_IMC, CODEC_ID_MUSEPACK7, CODEC_ID_MLP, + CODEC_ID_GSM_MS, /* As found in WAV */ /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, @@ -2165,6 +2166,7 @@ extern AVCodec huffyuv_encoder; extern AVCodec jpegls_encoder; extern AVCodec libgsm_encoder; +extern AVCodec libgsm_ms_encoder; extern AVCodec libtheora_encoder; extern AVCodec ljpeg_encoder; extern AVCodec mdec_encoder; @@ -2242,6 +2244,7 @@ extern AVCodec interplay_video_decoder; extern AVCodec kmvc_decoder; extern AVCodec libgsm_decoder; +extern AVCodec libgsm_ms_decoder; extern AVCodec loco_decoder; extern AVCodec mace3_decoder; extern AVCodec mace6_decoder;
--- a/libgsm.c Tue Feb 20 10:34:01 2007 +0000 +++ b/libgsm.c Tue Feb 20 11:09:47 2007 +0000 @@ -1,6 +1,7 @@ /* * Interface to libgsm for gsm encoding/decoding * Copyright (c) 2005 Alban Bedel <albeu@free.fr> + * Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux@mediaxim.be> * * This file is part of FFmpeg. * @@ -24,21 +25,34 @@ * Interface to libgsm for gsm encoding/decoding */ +// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + #include "avcodec.h" #include <gsm.h> // gsm.h miss some essential constants #define GSM_BLOCK_SIZE 33 +#define GSM_MS_BLOCK_SIZE 65 #define GSM_FRAME_SIZE 160 static int libgsm_init(AVCodecContext *avctx) { - if (avctx->channels > 1 || avctx->sample_rate != 8000) + if (avctx->channels > 1 || avctx->sample_rate != 8000 || avctx->bit_rate != 13000) return -1; - avctx->frame_size = GSM_FRAME_SIZE; - avctx->block_align = GSM_BLOCK_SIZE; + avctx->priv_data = gsm_create(); - avctx->priv_data = gsm_create(); + switch(avctx->codec_id) { + case CODEC_ID_GSM: + avctx->frame_size = GSM_FRAME_SIZE; + avctx->block_align = GSM_BLOCK_SIZE; + break; + case CODEC_ID_GSM_MS: { + int one = 1; + gsm_option(avctx->priv_data, GSM_OPT_WAV49, &one); + avctx->frame_size = 2*GSM_FRAME_SIZE; + avctx->block_align = GSM_MS_BLOCK_SIZE; + } + } avctx->coded_frame= avcodec_alloc_frame(); avctx->coded_frame->key_frame= 1; @@ -55,11 +69,17 @@ static int libgsm_encode_frame(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) { // we need a full block - if(buf_size < GSM_BLOCK_SIZE) return 0; + if(buf_size < avctx->block_align) return 0; - gsm_encode(avctx->priv_data,data,frame); - - return GSM_BLOCK_SIZE; + switch(avctx->codec_id) { + case CODEC_ID_GSM: + gsm_encode(avctx->priv_data,data,frame); + break; + case CODEC_ID_GSM_MS: + gsm_encode(avctx->priv_data,data,frame); + gsm_encode(avctx->priv_data,((short*)data)+GSM_FRAME_SIZE,frame+32); + } + return avctx->block_align; } @@ -73,16 +93,33 @@ libgsm_close, }; +AVCodec libgsm_ms_encoder = { + "gsm", + CODEC_TYPE_AUDIO, + CODEC_ID_GSM_MS, + 0, + libgsm_init, + libgsm_encode_frame, + libgsm_close, +}; + static int libgsm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) { - if(buf_size < GSM_BLOCK_SIZE) return 0; + if(buf_size < avctx->block_align) return 0; - if(gsm_decode(avctx->priv_data,buf,data)) return -1; - - *data_size = GSM_FRAME_SIZE*2; - return GSM_BLOCK_SIZE; + switch(avctx->codec_id) { + case CODEC_ID_GSM: + if(gsm_decode(avctx->priv_data,buf,data)) return -1; + *data_size = GSM_FRAME_SIZE*sizeof(int16_t); + break; + case CODEC_ID_GSM_MS: + if(gsm_decode(avctx->priv_data,buf,data) || + gsm_decode(avctx->priv_data,buf+33,((int16_t*)data)+GSM_FRAME_SIZE)) return -1; + *data_size = GSM_FRAME_SIZE*sizeof(int16_t)*2; + } + return avctx->block_align; } AVCodec libgsm_decoder = { @@ -95,3 +132,14 @@ libgsm_close, libgsm_decode_frame, }; + +AVCodec libgsm_ms_decoder = { + "gsm_ms", + CODEC_TYPE_AUDIO, + CODEC_ID_GSM_MS, + 0, + libgsm_init, + NULL, + libgsm_close, + libgsm_decode_frame, +};