* This plugin makes use of liba52 to decode A/52 audio
* (http://liba52.sf.net/).
*****************************************************************************
- * Copyright (C) 2001-2009 the VideoLAN team
+ * Copyright (C) 2001-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
* Christophe Massiot <massiot@via.ecp.fr>
*
- * 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.
*****************************************************************************/
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+
/*****************************************************************************
* Preamble
*****************************************************************************/
bool b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
- int pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
+ uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
};
/*****************************************************************************
set_description( N_("ATSC A/52 (AC-3) audio decoder") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
- add_bool( "a52-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
- add_bool( "a52-upmix", false, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true )
- set_capability( "audio filter2", 100 )
+ add_bool( "a52-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+ add_bool( "a52-upmix", false, UPMIX_TEXT, UPMIX_LONGTEXT, true )
+ set_capability( "audio converter", 100 )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
* Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
- audio_format_t input, audio_format_t output )
+ const audio_format_t *restrict input,
+ const audio_format_t *restrict output )
{
- p_sys->b_dynrng = config_GetInt( p_this, "a52-dynrng" );
+ p_sys->b_dynrng = var_InheritBool( p_this, "a52-dynrng" );
p_sys->b_dontwarn = 0;
/* No upmixing: it's not necessary and some other filters may want to do
* it themselves. */
- if ( aout_FormatNbChannels( &output ) > aout_FormatNbChannels( &input ) )
+ if ( aout_FormatNbChannels( output ) > aout_FormatNbChannels( input ) )
{
- if ( ! config_GetInt( p_this, "a52-upmix" ) )
+ if ( ! var_InheritBool( p_this, "a52-upmix" ) )
{
return VLC_EGENERIC;
}
}
/* We'll do our own downmixing, thanks. */
- p_sys->i_nb_channels = aout_FormatNbChannels( &output );
- switch ( (output.i_physical_channels & AOUT_CHAN_PHYSMASK)
- & ~AOUT_CHAN_LFE )
+ p_sys->i_nb_channels = aout_FormatNbChannels( output );
+ switch ( output->i_physical_channels & ~AOUT_CHAN_LFE )
{
case AOUT_CHAN_CENTER:
- if ( (output.i_original_channels & AOUT_CHAN_CENTER)
- || (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 ( 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 ( output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ if ( output->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
p_sys->i_flags = A52_DOLBY;
}
- else if ( input.i_original_channels == AOUT_CHAN_CENTER )
+ else if ( input->i_original_channels == AOUT_CHAN_CENTER )
{
p_sys->i_flags = A52_MONO;
}
- else if ( input.i_original_channels & AOUT_CHAN_DUALMONO )
+ else if ( input->i_original_channels & AOUT_CHAN_DUALMONO )
{
p_sys->i_flags = A52_CHANNEL;
}
- else if ( !(output.i_original_channels & AOUT_CHAN_RIGHT) )
+ else if ( !(output->i_original_channels & AOUT_CHAN_RIGHT) )
{
p_sys->i_flags = A52_CHANNEL1;
}
- else if ( !(output.i_original_channels & AOUT_CHAN_LEFT) )
+ else if ( !(output->i_original_channels & AOUT_CHAN_LEFT) )
{
p_sys->i_flags = A52_CHANNEL2;
}
free( p_sys );
return VLC_EGENERIC;
}
- if ( output.i_physical_channels & AOUT_CHAN_LFE )
+ if ( output->i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= A52_LFE;
}
}
aout_CheckChannelReorder( pi_channels_in, NULL,
- output.i_physical_channels & AOUT_CHAN_PHYSMASK,
- p_sys->i_nb_channels,
+ output->i_physical_channels,
p_sys->pi_chan_table );
return VLC_SUCCESS;
* Interleave: helper function to interleave channels
*****************************************************************************/
static void Interleave( sample_t * p_out, const sample_t * p_in,
- int i_nb_channels, int *pi_chan_table )
+ int i_nb_channels, uint8_t *pi_chan_table )
{
/* We do not only have to interleave, but also reorder the channels */
}
/*****************************************************************************
- * DoWork: decode an ATSC A/52 frame.
+ * Convert: decode an ATSC A/52 frame.
*****************************************************************************/
-static void DoWork( filter_t * p_filter,
- aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+
+static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
{
- filter_sys_t *p_sys = p_filter->p_sys;
+ filter_sys_t *p_sys = p_filter->p_sys;
#ifdef LIBA52_FIXED
- sample_t i_sample_level = (1 << 24);
+ sample_t i_sample_level = (1 << 24);
#else
- sample_t i_sample_level = 1;
+ sample_t i_sample_level = 1;
#endif
- int i_flags = p_sys->i_flags;
- int i_bytes_per_block = 256 * p_sys->i_nb_channels
- * sizeof(sample_t);
- int i;
+ int i_flags = p_sys->i_flags;
+ size_t i_bytes_per_block = 256 * p_sys->i_nb_channels * sizeof(sample_t);
+
+ block_t *p_out_buf = filter_NewAudioBuffer( p_filter, 6 * i_bytes_per_block );
+ if( unlikely(p_out_buf == NULL) )
+ goto out;
/* Do the actual decoding now. */
a52_frame( p_sys->p_liba52, p_in_buf->p_buffer,
a52_dynrng( p_sys->p_liba52, NULL, NULL );
}
- for ( i = 0; i < 6; i++ )
+ for( unsigned i = 0; i < 6; i++ )
{
sample_t * p_samples;
}
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_buffer = i_bytes_per_block * 6;
+ p_out_buf->i_dts = p_in_buf->i_dts;
+ p_out_buf->i_pts = p_in_buf->i_pts;
+ p_out_buf->i_length = p_in_buf->i_length;
+out:
+ block_Release( p_in_buf );
+ return p_out_buf;
}
/*****************************************************************************
filter_sys_t *p_sys;
int i_ret;
- if( p_filter->fmt_in.i_codec != VLC_CODEC_A52 )
- {
+ if( p_filter->fmt_in.i_codec != VLC_CODEC_A52 )
return VLC_EGENERIC;
- }
-
- p_filter->fmt_out.audio.i_format =
#ifdef LIBA52_FIXED
- p_filter->fmt_out.i_codec = VLC_CODEC_FI32;
+ if( p_filter->fmt_out.audio.i_format != VLC_CODEC_FI32 )
#else
- p_filter->fmt_out.i_codec = VLC_CODEC_FL32;
+ if( p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
#endif
- p_filter->fmt_out.audio.i_bitspersample =
- aout_BitsPerSample( p_filter->fmt_out.i_codec );
+ return VLC_EGENERIC;
/* Allocate the memory needed to store the module's structure */
p_filter->p_sys = p_sys = malloc( sizeof(filter_sys_t) );
return VLC_ENOMEM;
i_ret = Open( VLC_OBJECT(p_filter), p_sys,
- p_filter->fmt_in.audio, p_filter->fmt_out.audio );
+ &p_filter->fmt_in.audio, &p_filter->fmt_out.audio );
p_filter->pf_audio_filter = Convert;
p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
a52_free( p_sys->p_liba52 );
free( p_sys );
}
-
-static block_t *Convert( filter_t *p_filter, block_t *p_block )
-{
- if( !p_block || !p_block->i_nb_samples )
- {
- if( p_block )
- block_Release( p_block );
- return NULL;
- }
-
- size_t i_out_size = p_block->i_nb_samples *
- p_filter->fmt_out.audio.i_bitspersample *
- p_filter->fmt_out.audio.i_channels / 8;
-
- block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
- if( !p_out )
- {
- msg_Warn( p_filter, "can't get output buffer" );
- block_Release( p_block );
- return NULL;
- }
-
- p_out->i_nb_samples = p_block->i_nb_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;
-
- DoWork( p_filter, p_block, p_out );
-
- block_Release( p_block );
-
- return p_out;
-}
projects / vlc / blobdiff