* Copyright (C) 2001, 2002 VideoLAN
* $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
* Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
# include "a52dec/a52.h"
#endif
-#include "audio_output.h"
+#include <vlc/decoder.h>
#include "aout_internal.h"
+#include "vlc_filter.h"
/*****************************************************************************
* Local prototypes
static void Destroy ( vlc_object_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 *,
+ 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 * );
/*****************************************************************************
* Local structures
*****************************************************************************/
-struct aout_filter_sys_t
+struct filter_sys_t
{
a52_state_t * p_liba52; /* liba52 internal structure */
vlc_bool_t b_dynrng; /* see below */
add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
+
+ add_submodule();
+ set_description( _("ATSC A/52 (AC-3) 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 = (filter_sys_t *)p_filter->p_sys;
+ int i_ret;
if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ')
|| 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, "a52-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, "a52-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 = A52_MONO;
}
- else if ( p_filter->output.i_original_channels & AOUT_CHAN_LEFT )
+ else if ( output.i_original_channels & AOUT_CHAN_LEFT )
{
p_sys->i_flags = A52_CHANNEL1;
}
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 = A52_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 = A52_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 = A52_CHANNEL;
}
- else if ( !(p_filter->output.i_original_channels & AOUT_CHAN_RIGHT) )
+ else if ( !(output.i_original_channels & AOUT_CHAN_RIGHT) )
{
p_sys->i_flags = A52_CHANNEL1;
}
- else if ( !(p_filter->output.i_original_channels & AOUT_CHAN_LEFT) )
+ else if ( !(output.i_original_channels & AOUT_CHAN_LEFT) )
{
p_sys->i_flags = A52_CHANNEL2;
}
break;
default:
- msg_Warn( p_filter, "unknown sample format!" );
+ msg_Warn( p_this, "unknown sample format!" );
free( p_sys );
- return -1;
+ return VLC_EGENERIC;
}
- if ( p_filter->output.i_physical_channels & AOUT_CHAN_LFE )
+ if ( output.i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= A52_LFE;
}
p_sys->p_liba52 = a52_init( 0 );
if( p_sys->p_liba52 == NULL )
{
- msg_Err( p_filter, "unable to initialize liba52" );
- return -1;
+ msg_Err( p_this, "unable to initialize liba52" );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
-
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
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( !p_sys->b_dynrng )
{
- a52_dynrng( p_filter->p_sys->p_liba52, NULL, NULL );
+ a52_dynrng( p_sys->p_liba52, NULL, NULL );
}
for ( i = 0; i < 6; i++ )
/*****************************************************************************
* 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;
a52_free( p_sys->p_liba52 );
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('a','5','2',' ') )
+ {
+ 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;
+
+ a52_free( p_sys->p_liba52 );
+ 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 = p_block->i_samples *
+ p_filter->fmt_out.audio.i_bitspersample *
+ p_filter->fmt_out.audio.i_channels;
+
+ 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" );
+ 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 );
+
+ return p_out;
+}