/*****************************************************************************
* adpcm.c : adpcm variant audio decoder
*****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Rémi Denis-Courmont <rem # videolan.org>
*
- * 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 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_aout.h>
#include <vlc_codec.h>
/*****************************************************************************
static int OpenDecoder( vlc_object_t * );
static void CloseDecoder( vlc_object_t * );
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
vlc_module_begin ()
set_description( N_("ADPCM audio decoder") )
size_t i_block;
size_t i_samplesperblock;
- audio_date_t end_date;
+ date_t end_date;
};
static void DecodeAdpcmMs ( decoder_t *, int16_t *, uint8_t * );
case VLC_FOURCC('i','m','a', '4'): /* IMA ADPCM */
case VLC_FOURCC('m','s',0x00,0x02): /* MS ADPCM */
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_CODEC_ADPCM_DK3:
+ case VLC_CODEC_ADPCM_DK4:
case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
break;
default:
case VLC_FOURCC('i','m','a', '4'): /* IMA ADPCM */
p_sys->codec = ADPCM_IMA_QT;
break;
- case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */
+ case VLC_CODEC_ADPCM_IMA_WAV: /* IMA ADPCM */
p_sys->codec = ADPCM_IMA_WAV;
break;
- case VLC_FOURCC('m','s',0x00,0x02): /* MS ADPCM */
+ case VLC_CODEC_ADPCM_MS: /* MS ADPCM */
p_sys->codec = ADPCM_MS;
break;
- case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */
+ case VLC_CODEC_ADPCM_DK4: /* Duck DK4 ADPCM */
p_sys->codec = ADPCM_DK4;
break;
- case VLC_FOURCC('m','s',0x00,0x62): /* Duck DK3 ADPCM */
+ case VLC_CODEC_ADPCM_DK3: /* Duck DK3 ADPCM */
p_sys->codec = ADPCM_DK3;
break;
case VLC_FOURCC('X','A','J', 0): /* EA ADPCM */
p_dec->fmt_in.audio.i_bitspersample, p_sys->i_block,
p_sys->i_samplesperblock );
- p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate;
p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
p_dec->fmt_out.audio.i_physical_channels =
p_dec->fmt_out.audio.i_original_channels =
pi_channels_maps[p_dec->fmt_in.audio.i_channels];
- aout_DateInit( &p_sys->end_date, p_dec->fmt_out.audio.i_rate );
- aout_DateSet( &p_sys->end_date, 0 );
+ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
+ date_Set( &p_sys->end_date, 0 );
p_dec->pf_decode_audio = DecodeBlock;
/*****************************************************************************
* DecodeBlock:
*****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
p_block = *pp_block;
- if( p_block->i_pts != 0 &&
- p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
+ if( p_block->i_pts > VLC_TS_INVALID &&
+ p_block->i_pts != date_Get( &p_sys->end_date ) )
{
- aout_DateSet( &p_sys->end_date, p_block->i_pts );
+ date_Set( &p_sys->end_date, p_block->i_pts );
}
- else if( !aout_DateGet( &p_sys->end_date ) )
+ else if( !date_Get( &p_sys->end_date ) )
{
/* We've just started the stream, wait for the first PTS. */
block_Release( p_block );
}
/* Don't re-use the same pts twice */
- p_block->i_pts = 0;
+ p_block->i_pts = VLC_TS_INVALID;
if( p_block->i_buffer >= p_sys->i_block )
{
- aout_buffer_t *p_out;
+ block_t *p_out;
p_out = decoder_NewAudioBuffer( p_dec, p_sys->i_samplesperblock );
if( p_out == NULL )
return NULL;
}
- p_out->start_date = aout_DateGet( &p_sys->end_date );
- p_out->end_date =
- aout_DateIncrement( &p_sys->end_date, p_sys->i_samplesperblock );
+ p_out->i_pts = date_Get( &p_sys->end_date );
+ p_out->i_length = date_Increment( &p_sys->end_date,
+ p_sys->i_samplesperblock ) - p_out->i_pts;
switch( p_sys->codec )
{
static void DecodeAdpcmEA( decoder_t *p_dec, int16_t *p_sample,
uint8_t *p_buffer )
{
- static const uint32_t EATable[]=
+ static const int16_t EATable[]=
{
- 0x00000000, 0x000000F0, 0x000001CC, 0x00000188,
- 0x00000000, 0x00000000, 0xFFFFFF30, 0xFFFFFF24,
- 0x00000000, 0x00000001, 0x00000003, 0x00000004,
- 0x00000007, 0x00000008, 0x0000000A, 0x0000000B,
- 0x00000000, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFC
+ 0x0000, 0x00F0, 0x01CC, 0x0188, 0x0000, 0x0000, 0xFF30, 0xFF24,
+ 0x0000, 0x0001, 0x0003, 0x0004, 0x0007, 0x0008, 0x000A, 0x000B,
+ 0x0000, 0xFFFF, 0xFFFD, 0xFFFC,
};
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];
+ int_fast32_t c1[MAX_CHAN], c2[MAX_CHAN];
+ int_fast8_t d[MAX_CHAN];
- prev = (int16_t *)p_dec->fmt_in.p_extra;
- cur = prev + i_channels;
+ unsigned chans = p_dec->fmt_in.audio.i_channels;
+ const uint8_t *p_end = &p_buffer[p_sys->i_block];
+ int16_t *prev = (int16_t *)p_dec->fmt_in.p_extra;
+ int16_t *cur = prev + chans;
- for (c = 0; c < i_channels; c++)
+ for (unsigned c = 0; c < chans; c++)
{
- uint8_t input;
+ uint8_t input = p_buffer[c];
- 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 (p_buffer += chans; p_buffer < p_end; p_buffer += chans)
{
- for (c = 0; c < i_channels; c++)
- {
- int32_t spl;
+ union { uint32_t u; int32_t i; } 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 );
+ for (unsigned c = 0; c < chans; c++)
+ {
+ spl.u = (p_buffer[c] & 0xf0u) << 24u;
+ spl.i >>= d[c];
+ spl.i = (spl.i + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8;
+ CLAMP(spl.i, -32768, 32767);
prev[c] = cur[c];
- cur[c] = spl;
+ cur[c] = spl.i;
- *(p_sample++) = spl;
+ *(p_sample++) = spl.i;
}
- for (c = 0; c < i_channels; c++)
+ for (unsigned c = 0; c < chans; 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 );
+ spl.u = (p_buffer[c] & 0x0fu) << 28u;
+ spl.i >>= d[c];
+ spl.i = (spl.i + cur[c] * c1[c] + prev[c] * c2[c] + 0x80) >> 8;
+ CLAMP(spl.i, -32768, 32767);
prev[c] = cur[c];
- cur[c] = spl;
+ cur[c] = spl.i;
- *(p_sample++) = spl;
+ *(p_sample++) = spl.i;
}
}
}
projects / vlc / blobdiff