/*****************************************************************************
* 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 "config.h"
#endif
-#include <vlc/vlc.h>
+#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( _("ADPCM audio decoder") );
- set_capability( "decoder", 50 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACODEC );
- set_callbacks( OpenDecoder, CloseDecoder );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("ADPCM audio decoder") )
+ set_capability( "decoder", 50 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ set_callbacks( OpenDecoder, CloseDecoder )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
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 */
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 */
{
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 %zu", p_sys->i_block );
}
else
{
}
msg_Dbg( p_dec, "format: samplerate:%d Hz channels:%d bits/sample:%d "
- "blockalign:%d samplesperblock:%d",
+ "blockalign:%zu samplesperblock:%zu",
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 );
- 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 = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_samplesperblock );
+ p_out = decoder_NewAudioBuffer( p_dec, p_sys->i_samplesperblock );
if( p_out == NULL )
{
block_Release( p_block );
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 )
{
projects / vlc / blobdiff