X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_filter%2Fconverter%2Fa52tospdif.c;h=2e4a820702e5882e4536f8bc006ce0dcb37693ab;hb=3392ff1e732347b1f8cf0163ba0325eca58622e7;hp=7bfc5809a20a775623ed146582f9925094e556b8;hpb=55c960749e8f91763e720ac610d5dd56f90fcde1;p=vlc diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c index 7bfc5809a2..2e4a820702 100644 --- a/modules/audio_filter/converter/a52tospdif.c +++ b/modules/audio_filter/converter/a52tospdif.c @@ -1,25 +1,25 @@ /***************************************************************************** * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets ***************************************************************************** - * Copyright (C) 2002, 2006 the VideoLAN team + * Copyright (C) 2002, 2006 VLC authors and VideoLAN * $Id$ * * Authors: Christophe Massiot * 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 + * 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. *****************************************************************************/ /***************************************************************************** @@ -33,18 +33,14 @@ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif - #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 @@ -53,7 +49,7 @@ 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_capability( "audio converter", 10 ) set_callbacks( Create, NULL ) vlc_module_end () @@ -62,59 +58,63 @@ vlc_module_end () *****************************************************************************/ 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 != VLC_CODEC_A52 || - ( p_filter->output.i_format != VLC_CODEC_SPDIFB && - p_filter->output.i_format != VLC_CODEC_SPDIFL ) ) + 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 ) { - VLC_UNUSED(p_aout); /* 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_nb_bytes / 2; + 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 = block_Alloc( AOUT_SPDIF_SIZE ); + if( !p_out_buf ) + goto out; uint8_t * p_out = p_out_buf->p_buffer; /* Copy the S/PDIF headers. */ - if( p_filter->output.i_format == VLC_CODEC_SPDIFB ) + if( p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFB ) { - vlc_memcpy( p_out, p_sync_be, 6 ); + memcpy( p_out, p_sync_be, 6 ); p_out[4] = p_in[5] & 0x7; /* bsmod */ - p_out[6] = (i_frame_size >> 4) & 0xff; - p_out[7] = (i_frame_size << 4) & 0xff; - vlc_memcpy( &p_out[8], p_in, i_frame_size * 2 ); + SetWBE( p_out + 6, i_frame_size << 4 ); + memcpy( &p_out[8], p_in, i_frame_size * 2 ); } else { - vlc_memcpy( p_out, p_sync_le, 6 ); + memcpy( p_out, p_sync_le, 6 ); p_out[5] = p_in[5] & 0x7; /* bsmod */ - p_out[6] = (i_frame_size << 4) & 0xff; - p_out[7] = (i_frame_size >> 4) & 0xff; + SetWLE( p_out + 6, i_frame_size << 4 ); swab( p_in, &p_out[8], i_frame_size * 2 ); } - vlc_memset( p_out + 8 + i_frame_size * 2, 0, + 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_nb_bytes = AOUT_SPDIF_SIZE; + p_out_buf->i_buffer = AOUT_SPDIF_SIZE; +out: + block_Release( p_in_buf ); + return p_out_buf; }