X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fadpcm.c;h=c06b8bcc7cd4b797f64dcc16a25d8686de78d23d;hb=65abf030acb9d0e88b0e3e36666ab5d2c5b613db;hp=fd13c66d8dc7e554bf4552204a2b937df22ca40b;hpb=4b47be3d6e43c18e42e0805d9061dd136843ed22;p=vlc diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c index fd13c66d8d..c06b8bcc7c 100644 --- a/modules/codec/adpcm.c +++ b/modules/codec/adpcm.c @@ -1,10 +1,11 @@ /***************************************************************************** * adpcm.c : adpcm variant audio decoder ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: adpcm.c,v 1.18 2003/11/23 04:58:00 fenrir Exp $ + * Copyright (C) 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar + * Rémi Denis-Courmont * * 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 @@ -18,7 +19,7 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -40,6 +41,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); vlc_module_begin(); set_description( _("ADPCM audio decoder") ); set_capability( "decoder", 50 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACODEC ); set_callbacks( OpenDecoder, CloseDecoder ); vlc_module_end(); @@ -52,7 +55,8 @@ enum adpcm_codec_e ADPCM_IMA_WAV, ADPCM_MS, ADPCM_DK3, - ADPCM_DK4 + ADPCM_DK4, + ADPCM_EA }; struct decoder_sys_t @@ -70,6 +74,7 @@ static void DecodeAdpcmImaWav( decoder_t *, int16_t *, uint8_t * ); static void DecodeAdpcmImaQT ( decoder_t *, int16_t *, uint8_t * ); static void DecodeAdpcmDk4 ( decoder_t *, int16_t *, uint8_t * ); static void DecodeAdpcmDk3 ( decoder_t *, int16_t *, uint8_t * ); +static void DecodeAdpcmEA ( decoder_t *, int16_t *, uint8_t * ); static int pi_channels_maps[6] = { @@ -133,23 +138,17 @@ static int OpenDecoder( vlc_object_t *p_this ) case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */ case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */ case VLC_FOURCC('m','s',0x00,0x62): /* Duck DK3 ADPCM */ + case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */ break; default: return VLC_EGENERIC; } - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_dec->p_sys = p_sys = - (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } - if( p_dec->fmt_in.audio.i_channels <= 0 || p_dec->fmt_in.audio.i_channels > 5 ) { - msg_Err( p_dec, "bad channels count(1-5)" ); + msg_Err( p_dec, "invalid number of channel (not between 1 and 5): %i", + p_dec->fmt_in.audio.i_channels ); return VLC_EGENERIC; } @@ -159,6 +158,14 @@ static int OpenDecoder( vlc_object_t *p_this ) return VLC_EGENERIC; } + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_dec->p_sys = p_sys = + (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) + { + msg_Err( p_dec, "out of memory" ); + return VLC_ENOMEM; + } + switch( p_dec->fmt_in.i_codec ) { case VLC_FOURCC('i','m','a', '4'): /* IMA ADPCM */ @@ -176,13 +183,23 @@ static int OpenDecoder( vlc_object_t *p_this ) case VLC_FOURCC('m','s',0x00,0x62): /* Duck DK3 ADPCM */ p_sys->codec = ADPCM_DK3; break; + case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */ + p_sys->codec = ADPCM_EA; + p_dec->fmt_in.p_extra = calloc( 2 * p_dec->fmt_in.audio.i_channels, + sizeof( int16_t ) ); + if( p_dec->fmt_in.p_extra == NULL ) + { + free( p_sys ); + return VLC_ENOMEM; + } + break; } if( p_dec->fmt_in.audio.i_blockalign <= 0 ) { p_sys->i_block = (p_sys->codec == ADPCM_IMA_QT) ? 34 * p_dec->fmt_in.audio.i_channels : 1024; - msg_Warn( p_dec, "block size undefined, -> using %d", p_sys->i_block ); + msg_Warn( p_dec, "block size undefined, using %d", p_sys->i_block ); } else { @@ -214,10 +231,14 @@ static int OpenDecoder( vlc_object_t *p_this ) p_dec->fmt_in.audio.i_channels = 2; p_sys->i_samplesperblock = ( 4 * ( p_sys->i_block - 16 ) + 2 )/ 3; break; + case ADPCM_EA: + p_sys->i_samplesperblock = + 2 * (p_sys->i_block - p_dec->fmt_in.audio.i_channels) / + p_dec->fmt_in.audio.i_channels; } - msg_Dbg( p_dec, "format: samplerate:%dHz channels:%d bits/sample:%d " - "blockalign:%d samplesperblock %d", + msg_Dbg( p_dec, "format: samplerate:%d Hz channels:%d bits/sample:%d " + "blockalign:%d samplesperblock:%d", p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels, p_dec->fmt_in.audio.i_bitspersample, p_sys->i_block, p_sys->i_samplesperblock ); @@ -301,6 +322,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) DecodeAdpcmDk3( p_dec, (int16_t*)p_out->p_buffer, p_block->p_buffer ); break; + case ADPCM_EA: + DecodeAdpcmEA( p_dec, (int16_t*)p_out->p_buffer, + p_block->p_buffer ); default: break; } @@ -322,6 +346,8 @@ static void CloseDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; + if( p_sys->codec == ADPCM_EA ) + free( p_dec->fmt_in.p_extra ); free( p_sys ); } @@ -691,3 +717,74 @@ static void DecodeAdpcmDk3( decoder_t *p_dec, int16_t *p_sample, } } } + + +/* + * EA ADPCM + */ +#define MAX_CHAN 5 +static void DecodeAdpcmEA( decoder_t *p_dec, int16_t *p_sample, + uint8_t *p_buffer ) +{ + static const uint32_t EATable[]= + { + 0x00000000, 0x000000F0, 0x000001CC, 0x00000188, + 0x00000000, 0x00000000, 0xFFFFFF30, 0xFFFFFF24, + 0x00000000, 0x00000001, 0x00000003, 0x00000004, + 0x00000007, 0x00000008, 0x0000000A, 0x0000000B, + 0x00000000, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFC + }; + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_end; + unsigned i_channels, c; + int16_t *prev, *cur; + int32_t c1[MAX_CHAN], c2[MAX_CHAN]; + int8_t d[MAX_CHAN]; + + i_channels = p_dec->fmt_in.audio.i_channels; + p_end = &p_buffer[p_sys->i_block]; + + prev = (int16_t *)p_dec->fmt_in.p_extra; + cur = prev + i_channels; + + for (c = 0; c < i_channels; c++) + { + uint8_t input; + + input = p_buffer[c]; + c1[c] = EATable[input >> 4]; + c2[c] = EATable[(input >> 4) + 4]; + d[c] = (input & 0xf) + 8; + } + + for( p_buffer += i_channels; p_buffer < p_end ; p_buffer += i_channels) + { + for (c = 0; c < i_channels; c++) + { + int32_t spl; + + spl = (p_buffer[c] >> 4) & 0xf; + spl = (spl << 0x1c) >> d[c]; + spl = (spl + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8; + CLAMP( spl, -32768, 32767 ); + prev[c] = cur[c]; + cur[c] = spl; + + *(p_sample++) = spl; + } + + for (c = 0; c < i_channels; c++) + { + int32_t spl; + + spl = p_buffer[c] & 0xf; + spl = (spl << 0x1c) >> d[c]; + spl = (spl + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8; + CLAMP( spl, -32768, 32767 ); + prev[c] = cur[c]; + cur[c] = spl; + + *(p_sample++) = spl; + } + } +}