/*****************************************************************************
* dtstospdif.c : encapsulates DTS frames into S/PDIF packets
*****************************************************************************
- * Copyright (C) 2003 the VideoLAN team
+ * Copyright (C) 2003, 2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* 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
*
* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include <vlc/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
/*****************************************************************************
* Local structures
vlc_module_begin();
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
- set_description( _("audio filter for DTS->S/PDIF encapsulation") );
+ set_description( N_("Audio filter for DTS->S/PDIF encapsulation") );
set_capability( "audio filter", 10 );
set_callbacks( Create, Close );
vlc_module_end();
/* Allocate the memory needed to store the module's structure */
p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
if( p_filter->p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
memset( p_filter->p_sys, 0, sizeof(struct aout_filter_sys_t) );
p_filter->p_sys->p_buf = 0;
if( p_in_buf->i_nb_bytes != p_filter->p_sys->i_frame_size )
{
/* Frame size changed, reset everything */
+ msg_Warn( p_aout, "Frame size changed from %u to %u, "
+ "resetting everything.",
+ p_filter->p_sys->i_frame_size,
+ (unsigned)p_in_buf->i_nb_bytes );
+
p_filter->p_sys->i_frame_size = p_in_buf->i_nb_bytes;
p_filter->p_sys->p_buf = realloc( p_filter->p_sys->p_buf,
p_in_buf->i_nb_bytes * 3 );
}
/* Backup frame */
- p_filter->p_vlc->pf_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
- p_filter->p_sys->i_frames, p_in_buf->p_buffer,
- p_in_buf->i_nb_bytes );
+ vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
+ p_filter->p_sys->i_frames,
+ p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
p_filter->p_sys->i_frames++;
if( p_filter->p_sys->i_frames < 3 )
{
- if( !p_filter->p_sys->i_frames )
+ if( p_filter->p_sys->i_frames == 1 )
/* We'll need the starting date */
p_filter->p_sys->start_date = p_in_buf->start_date;
for( i_frame = 0; i_frame < 3; i_frame++ )
{
- byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
- byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
+ uint16_t i_length_padded = i_length;
+ uint8_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz);
+ uint8_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length);
switch( p_in_buf->i_nb_samples )
{
/* Copy the S/PDIF headers. */
if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
+ vlc_memcpy( p_out, p_sync_be, 6 );
p_out[5] = i_ac5_spdif_type;
p_out[6] = (( i_length ) >> 5 ) & 0xFF;
p_out[7] = ( i_length << 3 ) & 0xFF;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
+ vlc_memcpy( p_out, p_sync_le, 6 );
p_out[4] = i_ac5_spdif_type;
p_out[6] = ( i_length << 3 ) & 0xFF;
p_out[7] = (( i_length ) >> 5 ) & 0xFF;
}
- if( (p_in[0] == 0x1f || p_in[0] == 0x7f) && p_filter->output.i_format == VLC_FOURCC('s','p','d','i') )
+ if( ( (p_in[0] == 0x1F || p_in[0] == 0x7F) && p_filter->output.i_format == VLC_FOURCC('s','p','d','i') ) ||
+ ( (p_in[0] == 0xFF || p_in[0] == 0xFE) && p_filter->output.i_format == VLC_FOURCC('s','p','d','b') ) )
{
/* We are dealing with a big endian bitstream and a little endian output
- * Convert to little endian */
+ * or a little endian bitstream and a big endian output.
+ * Byteswap the stream */
#ifdef HAVE_SWAB
swab( p_in, p_out + 8, i_length );
#else
uint16_t i;
- byte_t * p_tmp, tmp;
+ uint8_t * p_tmp, tmp;
p_tmp = p_out + 8;
for( i = i_length / 2 ; i-- ; )
{
p_tmp += 2; p_in += 2;
}
#endif
- }
- else if( (p_in[0] == 0x1f || p_in[0] == 0x7f) ||
- p_filter->output.i_format == VLC_FOURCC('s','p','d','i') )
- {
- /* Big endian stream on Big endian output || little endian stream on little endian output */
- p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
+ /* If i_length is odd, we have to adjust swapping a bit.. */
+ if( i_length & 1 )
+ {
+ p_out[8+i_length-1] = 0;
+ p_out[8+i_length] = p_in[i_length-1];
+ i_length_padded++;
+ }
}
else
{
- msg_Err( p_filter, "Little endian DTS stream on big endian output not supported" );
- p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
+ vlc_memcpy( p_out + 8, p_in, i_length );
}
if( i_fz > i_length + 8 )
{
- p_filter->p_vlc->pf_memset( p_out + 8 + i_length, 0,
- i_fz - i_length - 8 );
+ vlc_memset( p_out + 8 + i_length_padded, 0,
+ i_fz - i_length_padded - 8 );
}
}