/*****************************************************************************
* dtstofloat32.c: DTS Coherent Acoustics decoder plugin for VLC.
- * This plugin makes use of libdts to do the actual decoding
- * (http://www.videolan.org/dtsdec/).
+ * This plugin makes use of libdca to do the actual decoding
+ * (http://developers.videolan.org/libdca.html).
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002libdca the VideoLAN team
* $Id$
*
* Author: Gildas Bazin <gbazin@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
* (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
*
* 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#include <vlc/vlc.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#include <dts.h> /* libdts header file */
+#include <dca.h> /* libdca header file */
-#include <vlc/decoder.h>
-#include "aout_internal.h"
+#include <vlc_aout.h>
+#include <vlc_block.h>
#include "vlc_filter.h"
/*****************************************************************************
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
+static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
static int Open ( vlc_object_t *, filter_sys_t *,
static void CloseFilter( vlc_object_t * );
static block_t *Convert( filter_t *, block_t * );
-/* libdts channel order */
+/* libdca channel order */
static const uint32_t pi_channels_in[] =
{ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_LFE, 0 };
*****************************************************************************/
struct filter_sys_t
{
- dts_state_t * p_libdts; /* libdts internal structure */
+ dca_state_t * p_libdca; /* libdca internal structure */
vlc_bool_t b_dynrng; /* see below */
- int i_flags; /* libdts flags, see dtsdec/doc/libdts.txt */
+ int i_flags; /* libdca flags, see dtsdec/doc/libdts.txt */
vlc_bool_t b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
- set_shortname( _("DTS" ) );
+ set_shortname( "DCA" );
set_description( _("DTS Coherent Acoustics audio decoder") );
add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 );
}
/*****************************************************************************
- * Open:
+ * Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
audio_format_t input, audio_format_t output )
|| (output.i_original_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
- p_sys->i_flags = DTS_MONO;
+ p_sys->i_flags = DCA_MONO;
}
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
if ( output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
- p_sys->i_flags = DTS_DOLBY;
+ p_sys->i_flags = DCA_DOLBY;
}
else if ( input.i_original_channels == AOUT_CHAN_CENTER )
{
- p_sys->i_flags = DTS_MONO;
+ p_sys->i_flags = DCA_MONO;
}
else if ( input.i_original_channels & AOUT_CHAN_DUALMONO )
{
- p_sys->i_flags = DTS_CHANNEL;
+ p_sys->i_flags = DCA_CHANNEL;
}
else
{
- p_sys->i_flags = DTS_STEREO;
+ p_sys->i_flags = DCA_STEREO;
}
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
- p_sys->i_flags = DTS_3F;
+ p_sys->i_flags = DCA_3F;
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
- p_sys->i_flags = DTS_2F1R;
+ p_sys->i_flags = DCA_2F1R;
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARCENTER:
- p_sys->i_flags = DTS_3F1R;
+ p_sys->i_flags = DCA_3F1R;
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = DTS_2F2R;
+ p_sys->i_flags = DCA_2F2R;
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = DTS_3F2R;
+ p_sys->i_flags = DCA_3F2R;
break;
default:
}
if ( output.i_physical_channels & AOUT_CHAN_LFE )
{
- p_sys->i_flags |= DTS_LFE;
+ p_sys->i_flags |= DCA_LFE;
}
- //p_sys->i_flags |= DTS_ADJUST_LEVEL;
+ //p_sys->i_flags |= DCA_ADJUST_LEVEL;
- /* Initialize libdts */
- p_sys->p_libdts = dts_init( 0 );
- if( p_sys->p_libdts == NULL )
+ /* Initialize libdca */
+ p_sys->p_libdca = dca_init( 0 );
+ if( p_sys->p_libdca == NULL )
{
- msg_Err( p_this, "unable to initialize libdts" );
+ msg_Err( p_this, "unable to initialize libdca" );
return VLC_EGENERIC;
}
/* Needs to be called so the decoder knows which type of bitstream it is
* dealing with. */
int i_sample_rate, i_bit_rate, i_frame_length;
- if( !dts_syncinfo( p_sys->p_libdts, p_in_buf->p_buffer, &i_flags,
+ if( !dca_syncinfo( p_sys->p_libdca, p_in_buf->p_buffer, &i_flags,
&i_sample_rate, &i_bit_rate, &i_frame_length ) )
{
- msg_Warn( p_aout, "libdts couldn't sync on frame" );
+ msg_Warn( p_aout, "libdca couldn't sync on frame" );
p_out_buf->i_nb_samples = p_out_buf->i_nb_bytes = 0;
return;
}
i_flags = p_sys->i_flags;
- dts_frame( p_sys->p_libdts, p_in_buf->p_buffer,
+ dca_frame( p_sys->p_libdca, p_in_buf->p_buffer,
&i_flags, &i_sample_level, 0 );
- if ( (i_flags & DTS_CHANNEL_MASK) != (p_sys->i_flags & DTS_CHANNEL_MASK)
+ if ( (i_flags & DCA_CHANNEL_MASK) != (p_sys->i_flags & DCA_CHANNEL_MASK)
&& !p_sys->b_dontwarn )
{
msg_Warn( p_aout,
- "libdts couldn't do the requested downmix 0x%x->0x%x",
- p_sys->i_flags & DTS_CHANNEL_MASK,
- i_flags & DTS_CHANNEL_MASK );
+ "libdca couldn't do the requested downmix 0x%x->0x%x",
+ p_sys->i_flags & DCA_CHANNEL_MASK,
+ i_flags & DCA_CHANNEL_MASK );
p_sys->b_dontwarn = 1;
}
if( 0)//!p_sys->b_dynrng )
{
- dts_dynrng( p_sys->p_libdts, NULL, NULL );
+ dca_dynrng( p_sys->p_libdca, NULL, NULL );
}
- for ( i = 0; i < dts_blocks_num(p_sys->p_libdts); i++ )
+ for ( i = 0; i < dca_blocks_num(p_sys->p_libdca); i++ )
{
sample_t * p_samples;
- if( dts_block( p_sys->p_libdts ) )
+ if( dca_block( p_sys->p_libdca ) )
{
- msg_Warn( p_aout, "dts_block failed for block %d", i );
+ msg_Warn( p_aout, "dca_block failed for block %d", i );
break;
}
- p_samples = dts_samples( p_sys->p_libdts );
+ p_samples = dca_samples( p_sys->p_libdca );
- if ( (p_sys->i_flags & DTS_CHANNEL_MASK) == DTS_MONO
- && (p_filter->output.i_physical_channels
+ if ( (p_sys->i_flags & DCA_CHANNEL_MASK) == DCA_MONO
+ && (p_filter->output.i_physical_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
}
else
{
- /* Interleave the *$£%ù samples. */
+ /* Interleave the *$£%ù samples. */
Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
}
aout_filter_t *p_filter = (aout_filter_t *)p_this;
filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
- dts_free( p_sys->p_libdts );
+ dca_free( p_sys->p_libdca );
free( p_sys );
}
/*****************************************************************************
- * OpenFilter:
+ * OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
- dts_free( p_sys->p_libdts );
+ dca_free( p_sys->p_libdca );
free( p_sys );
}
projects / vlc / blobdiff