X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fconverter%2Fa52tospdif.c;h=08e85814e403544accfcd9f888c7db9c2ab779ab;hb=22203a5835c4cb44be70653c94375af309141168;hp=1c9aa5f8cb662bfbd24aec137d02475d81b7b475;hpb=fec0d40b5e937a4bd6e646b897703d0b6369fc9f;p=vlc diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c index 1c9aa5f8cb..08e85814e4 100644 --- a/modules/audio_filter/converter/a52tospdif.c +++ b/modules/audio_filter/converter/a52tospdif.c @@ -1,17 +1,17 @@ /***************************************************************************** * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: a52tospdif.c,v 1.1 2002/08/11 22:36:35 massiot Exp $ + * Copyright (C) 2002, 2006 the VideoLAN team + * $Id$ * * Authors: Christophe Massiot - * Stéphane Borel + * Stéphane Borel * * 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 @@ -19,96 +19,102 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include /* malloc(), free() */ -#include -#include -#include "audio_output.h" -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include +#include /***************************************************************************** * Local prototypes *****************************************************************************/ static int Create ( vlc_object_t * ); - -static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, - aout_buffer_t * ); +static block_t *DoWork( filter_t *, block_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("aout filter for A/52->S/PDIF encapsulation") ); - set_capability( "audio filter", 10 ); - set_callbacks( Create, NULL ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_MISC ) + set_description( N_("Audio filter for A/52->S/PDIF encapsulation") ) + set_capability( "audio filter", 10 ) + set_callbacks( Create, NULL ) +vlc_module_end () /***************************************************************************** - * Create: allocate trivial mixer - ***************************************************************************** - * This function allocates and initializes a Crop vout method. + * Create: *****************************************************************************/ static int Create( vlc_object_t *p_this ) { - aout_filter_t * p_filter = (aout_filter_t *)p_this; + filter_t * p_filter = (filter_t *)p_this; - if ( p_filter->input.i_format != AOUT_FMT_A52 - && p_filter->output.i_format != AOUT_FMT_SPDIF ) + if ( p_filter->fmt_in.audio.i_format != VLC_CODEC_A52 || + ( p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFB && + p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFL ) ) { - return -1; + return VLC_EGENERIC; } - p_filter->pf_do_work = DoWork; - p_filter->b_in_place = 0; + p_filter->pf_audio_filter = DoWork; - return 0; + return VLC_SUCCESS; } /***************************************************************************** * DoWork: convert a buffer *****************************************************************************/ -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 ) +static block_t *DoWork( filter_t * p_filter, block_t *p_in_buf ) { - static const u8 p_sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 }; - u16 i_length = *(u16 *)p_in_buf->p_buffer; - u16 * pi_length; - byte_t * p_in = p_in_buf->p_buffer; - byte_t * p_out = p_out_buf->p_buffer; + /* AC3 is natively big endian. Most SPDIF devices have the native + * endianness of the computer system. + * On Mac OS X however, little endian devices are also common. + */ + static const uint8_t p_sync_le[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x01, 0x00 }; + static const uint8_t p_sync_be[6] = { 0xF8, 0x72, 0x4E, 0x1F, 0x00, 0x01 }; + uint16_t i_frame_size = p_in_buf->i_buffer / 2; + uint8_t * p_in = p_in_buf->p_buffer; + + block_t *p_out_buf = filter_NewAudioBuffer( p_filter, AOUT_SPDIF_SIZE ); + if( !p_out_buf ) + goto out; + uint8_t * p_out = p_out_buf->p_buffer; /* Copy the S/PDIF headers. */ - memcpy( p_out, p_sync, 6 ); - pi_length = (u16 *)(p_out + 6); - *pi_length = i_length; - - /* FIXME : if i_length is odd, the following code sucks. What should - * we do ? --Meuuh */ - -#ifndef WORDS_BIGENDIAN -# ifdef HAVE_SWAB - swab( p_out + 8, p_in + sizeof(u16), i_length ); -# else - p_out += 8; - p_in += sizeof(u16); - for ( i = 0; i < i_length / 2; i++ ) + if( p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFB ) { - p_out[0] = p_in[1]; - p_out[1] = p_in[0]; - p_out += 2; p_in += 2; + memcpy( p_out, p_sync_be, 6 ); + p_out[4] = p_in[5] & 0x7; /* bsmod */ + SetWBE( p_out + 6, i_frame_size << 4 ); + memcpy( &p_out[8], p_in, i_frame_size * 2 ); } -# endif - -#else - p_filter->p_vlc->pf_memcpy( p_out + 8, p_in + sizeof(u16), i_length ); -#endif - - p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; /* == 1 */ + else + { + memcpy( p_out, p_sync_le, 6 ); + p_out[5] = p_in[5] & 0x7; /* bsmod */ + SetWLE( p_out + 6, i_frame_size << 4 ); + swab( p_in, &p_out[8], i_frame_size * 2 ); + } + memset( p_out + 8 + i_frame_size * 2, 0, + AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 ); + + p_out_buf->i_dts = p_in_buf->i_dts; + p_out_buf->i_pts = p_in_buf->i_pts; + p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; + p_out_buf->i_buffer = AOUT_SPDIF_SIZE; +out: + block_Release( p_in_buf ); + return p_out_buf; }