* (http://www.videolan.org/dtsdec/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: dtstofloat32.c,v 1.2 2004/02/29 13:05:22 gbazin Exp $
+ * $Id$
*
- * Author: Gildas Bazin <gbazin@netcourrier.com>
+ * 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
#include <dts.h> /* libdts header file */
-#include "audio_output.h"
+#include <vlc/decoder.h>
#include "aout_internal.h"
+#include "vlc_filter.h"
/*****************************************************************************
* Local prototypes
static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
+static int Open ( vlc_object_t *, filter_sys_t *,
+ audio_format_t, audio_format_t );
+
+static int OpenFilter ( vlc_object_t * );
+static void CloseFilter( vlc_object_t * );
+static block_t *Convert( filter_t *, block_t * );
+
+/* libdts 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 };
+/* our internal channel order (WG-4 order) */
+static const uint32_t pi_channels_out[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+
/*****************************************************************************
* Local structures
*****************************************************************************/
-struct aout_filter_sys_t
+struct filter_sys_t
{
dts_state_t * p_libdts; /* libdts internal structure */
vlc_bool_t b_dynrng; /* see below */
int i_flags; /* libdts flags, see dtsdec/doc/libdts.txt */
vlc_bool_t b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
+
+ int pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
};
/*****************************************************************************
add_bool( "dts-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
+
+ add_submodule();
+ set_description( _("DTS Coherent Acoustics audio decoder") );
+ set_capability( "audio filter2", 100 );
+ set_callbacks( OpenFilter, CloseFilter );
vlc_module_end();
/*****************************************************************************
* Create:
*****************************************************************************/
-static int Create( vlc_object_t * _p_filter )
+static int Create( vlc_object_t *p_this )
{
- aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
- struct aout_filter_sys_t * p_sys;
+ aout_filter_t *p_filter = (aout_filter_t *)p_this;
+ filter_sys_t *p_sys;
+ int i_ret;
if ( p_filter->input.i_format != VLC_FOURCC('d','t','s',' ')
|| p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
}
/* Allocate the memory needed to store the module's structure */
- p_sys = p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
+ p_sys = malloc( sizeof(filter_sys_t) );
+ p_filter->p_sys = (struct aout_filter_sys_t *)p_sys;
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return -1;
}
- p_sys->b_dynrng = config_GetInt( p_filter, "dts-dynrng" );
+ i_ret = Open( VLC_OBJECT(p_filter), p_sys,
+ p_filter->input, p_filter->output );
+
+ p_filter->pf_do_work = DoWork;
+ p_filter->b_in_place = 0;
+
+ return i_ret;
+}
+
+/*****************************************************************************
+ * Open:
+ *****************************************************************************/
+static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
+ audio_format_t input, audio_format_t output )
+{
+ p_sys->b_dynrng = config_GetInt( p_this, "dts-dynrng" );
p_sys->b_dontwarn = 0;
/* We'll do our own downmixing, thanks. */
- p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output );
- switch ( (p_filter->output.i_physical_channels & AOUT_CHAN_PHYSMASK)
+ p_sys->i_nb_channels = aout_FormatNbChannels( &output );
+ switch ( (output.i_physical_channels & AOUT_CHAN_PHYSMASK)
& ~AOUT_CHAN_LFE )
{
case AOUT_CHAN_CENTER:
- if ( (p_filter->output.i_original_channels & AOUT_CHAN_CENTER)
- || (p_filter->output.i_original_channels
+ if ( (output.i_original_channels & AOUT_CHAN_CENTER)
+ || (output.i_original_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
p_sys->i_flags = DTS_MONO;
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
- if ( p_filter->output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ if ( output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
p_sys->i_flags = DTS_DOLBY;
}
- else if ( p_filter->input.i_original_channels == AOUT_CHAN_CENTER )
+ else if ( input.i_original_channels == AOUT_CHAN_CENTER )
{
p_sys->i_flags = DTS_MONO;
}
- else if ( p_filter->input.i_original_channels & AOUT_CHAN_DUALMONO )
+ else if ( input.i_original_channels & AOUT_CHAN_DUALMONO )
{
p_sys->i_flags = DTS_CHANNEL;
}
break;
default:
- msg_Warn( p_filter, "unknown sample format!" );
+ msg_Warn( p_this, "unknown sample format!" );
free( p_sys );
return -1;
}
- if ( p_filter->output.i_physical_channels & AOUT_CHAN_LFE )
+ if ( output.i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= DTS_LFE;
}
p_sys->p_libdts = dts_init( 0 );
if( p_sys->p_libdts == NULL )
{
- msg_Err( p_filter, "unable to initialize libdts" );
- return -1;
+ msg_Err( p_this, "unable to initialize libdts" );
+ return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
+ aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ output.i_physical_channels & AOUT_CHAN_PHYSMASK,
+ p_sys->i_nb_channels,
+ p_sys->pi_chan_table );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_nb_channels )
+static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
+ int *pi_chan_table )
{
- /* We do not only have to interleave, but also reorder the channels
- * Channel reordering according to number of output channels of libdts
- * The reordering needs to be different for different channel configurations
- * (3F2R, 1F2R etc), so this is only temporary.
- * The WG-4 order is appropriate for stereo, quadrophonia, and 5.1 surround.
- *
- * 6 channel mode
- * channel libdts order WG-4 order
- * 0 C // L
- * 1 L // R
- * 2 R // LS
- * 3 LS // RS
- * 4 RS // C
- * 5 LFE // LFE
- *
- * The libdts moves channels to the front if there are unused spaces, so
- * there is no gap between channels. The translation table says which
- * channel of the new stream is taken from which original channel [use
- * the new channel as the array index, use the number you get from the
- * array to address the original channel].
- */
-
- static const int translation[7][6] =
- {{ 0, 0, 0, 0, 0, 0 }, /* 0 channels (rarely used) */
- { 0, 0, 0, 0, 0, 0 }, /* 1 ch */
- { 0, 1, 0, 0, 0, 0 }, /* 2 */
- { 1, 2, 0, 0, 0, 0 }, /* 3 */
- { 0, 1, 2, 3, 0, 0 }, /* 4 */
- { 1, 2, 3, 4, 0, 0 }, /* 5 */
- { 1, 2, 3, 4, 0, 5 }}; /* 6 */
+ /* We do not only have to interleave, but also reorder the channels. */
int i, j;
for ( j = 0; j < i_nb_channels; j++ )
{
for ( i = 0; i < 256; i++ )
{
- p_out[i * i_nb_channels + j] = p_in[translation[i_nb_channels][j]
- * 256 + i];
+ p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
}
}
}
static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
- struct aout_filter_sys_t * p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
sample_t i_sample_level = 1;
int i_flags = p_sys->i_flags;
int i_bytes_per_block = 256 * p_sys->i_nb_channels
if( 0)//!p_sys->b_dynrng )
{
- dts_dynrng( p_filter->p_sys->p_libdts, NULL, NULL );
+ dts_dynrng( p_sys->p_libdts, NULL, NULL );
}
- for ( i = 0; i < dts_blocks_num(p_filter->p_sys->p_libdts); i++ )
+ for ( i = 0; i < dts_blocks_num(p_sys->p_libdts); i++ )
{
sample_t * p_samples;
{
/* Interleave the *$£%ù samples. */
Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels );
+ p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
}
}
/*****************************************************************************
* Destroy : deallocate data structures
*****************************************************************************/
-static void Destroy( vlc_object_t * _p_filter )
+static void Destroy( vlc_object_t *p_this )
{
- aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
- struct aout_filter_sys_t * p_sys = p_filter->p_sys;
+ 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 );
free( p_sys );
}
+
+/*****************************************************************************
+ * OpenFilter:
+ *****************************************************************************/
+static int OpenFilter( vlc_object_t *p_this )
+{
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
+ int i_ret;
+
+ if( p_filter->fmt_in.i_codec != VLC_FOURCC('d','t','s',' ') )
+ {
+ return VLC_EGENERIC;
+ }
+
+ p_filter->fmt_out.audio.i_format =
+ p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
+
+ /* Allocate the memory needed to store the module's structure */
+ p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
+ if( p_sys == NULL )
+ {
+ msg_Err( p_filter, "out of memory" );
+ return VLC_EGENERIC;
+ }
+
+ /* Allocate the memory needed to store the module's structure */
+ p_filter->p_sys = p_sys = malloc( sizeof(filter_sys_t) );
+ if( p_sys == NULL )
+ {
+ msg_Err( p_filter, "out of memory" );
+ return VLC_EGENERIC;
+ }
+
+ i_ret = Open( VLC_OBJECT(p_filter), p_sys,
+ p_filter->fmt_in.audio, p_filter->fmt_out.audio );
+
+ p_filter->pf_audio_filter = Convert;
+
+ return i_ret;
+}
+
+/*****************************************************************************
+ * CloseFilter : deallocate data structures
+ *****************************************************************************/
+static void CloseFilter( 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 );
+ free( p_sys );
+}
+
+static block_t *Convert( filter_t *p_filter, block_t *p_block )
+{
+ aout_filter_t aout_filter;
+ aout_buffer_t in_buf, out_buf;
+ block_t *p_out;
+ int i_out_size;
+
+ if( !p_block || !p_block->i_samples )
+ {
+ if( p_block ) p_block->pf_release( p_block );
+ return NULL;
+ }
+
+ i_out_size = p_block->i_samples *
+ p_filter->fmt_out.audio.i_bitspersample *
+ p_filter->fmt_out.audio.i_channels / 8;
+
+ p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
+ if( !p_out )
+ {
+ msg_Warn( p_filter, "can't get output buffer" );
+ p_block->pf_release( p_block );
+ return NULL;
+ }
+
+ p_out->i_samples = p_block->i_samples;
+ p_out->i_dts = p_block->i_dts;
+ p_out->i_pts = p_block->i_pts;
+ p_out->i_length = p_block->i_length;
+
+ aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
+ aout_filter.input = p_filter->fmt_in.audio;
+ aout_filter.input.i_format = p_filter->fmt_in.i_codec;
+ aout_filter.output = p_filter->fmt_out.audio;
+ aout_filter.output.i_format = p_filter->fmt_out.i_codec;
+
+ in_buf.p_buffer = p_block->p_buffer;
+ in_buf.i_nb_bytes = p_block->i_buffer;
+ in_buf.i_nb_samples = p_block->i_samples;
+ out_buf.p_buffer = p_out->p_buffer;
+ out_buf.i_nb_bytes = p_out->i_buffer;
+ out_buf.i_nb_samples = p_out->i_samples;
+
+ DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+
+ p_out->i_buffer = out_buf.i_nb_bytes;
+ p_out->i_samples = out_buf.i_nb_samples;
+
+ p_block->pf_release( p_block );
+
+ return p_out;
+}
projects / vlc / blobdiff