/*****************************************************************************
* dtstospdif.c : encapsulates DTS frames into S/PDIF packets
*****************************************************************************
- * Copyright (C) 2003, 2006 the VideoLAN team
+ * Copyright (C) 2003-2009 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Gildas Bazin
+ * Derk-Jan Hartman
+ * Pierre d'Herbemont
+ * Rémi Denis-Courmont
+ * Rafaël Carré
*
* 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
# include "config.h"
#endif
+#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
#include <vlc_common.h>
#include <vlc_plugin.h>
{
mtime_t start_date;
- /* 3 DTS frames have to be packed into an S/PDIF frame.
+ /* 3 DTS frames (max 2048) have to be packed into an S/PDIF frame (6144).
* We accumulate DTS frames from the decoder until we have enough to
* send. */
size_t i_frame_size;
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_description( N_("Audio filter for DTS->S/PDIF encapsulation") )
- set_capability( "audio filter2", 10 )
+ set_capability( "audio converter", 10 )
set_callbacks( Create, Close )
vlc_module_end ()
p_sys = p_filter->p_sys = malloc( sizeof(*p_sys) );
if( !p_sys )
return VLC_ENOMEM;
+
p_sys->p_buf = NULL;
p_sys->i_frame_size = 0;
p_sys->i_frames = 0;
p_filter->p_sys->i_frame_size, p_in_buf->i_buffer );
p_filter->p_sys->i_frame_size = p_in_buf->i_buffer;
- p_filter->p_sys->p_buf = realloc( p_filter->p_sys->p_buf,
- p_in_buf->i_buffer * 3 );
+ p_filter->p_sys->p_buf = xrealloc( p_filter->p_sys->p_buf,
+ p_in_buf->i_buffer * 3 );
p_filter->p_sys->i_frames = 0;
}
/* Backup frame */
/* TODO: keeping the blocks in a list would save one memcpy */
- vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_buffer *
+ memcpy( p_filter->p_sys->p_buf + p_in_buf->i_buffer *
p_filter->p_sys->i_frames,
p_in_buf->p_buffer, p_in_buf->i_buffer );
}
p_filter->p_sys->i_frames = 0;
- block_t *p_out_buf = filter_NewAudioBuffer( p_filter,
- 12 * p_in_buf->i_nb_samples );
+ block_t *p_out_buf = block_Alloc( 12 * p_in_buf->i_nb_samples );
if( !p_out_buf )
goto out;
/* Copy the S/PDIF headers. */
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[5] = i_ac5_spdif_type;
- p_out[6] = (( i_length ) >> 5 ) & 0xFF;
- p_out[7] = ( i_length << 3 ) & 0xFF;
+ SetWBE( p_out + 6, i_length << 3 );
}
else
{
- vlc_memcpy( p_out, p_sync_le, 6 );
+ 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;
+ SetWLE( p_out + 6, i_length << 3 );
}
if( ( (p_in[0] == 0x1F || p_in[0] == 0x7F) && p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFL ) ||
}
else
{
- vlc_memcpy( p_out + 8, p_in, i_length );
+ memcpy( p_out + 8, p_in, i_length );
}
if( i_fz > i_length + 8 )
{
- vlc_memset( p_out + 8 + i_length_padded, 0,
+ memset( p_out + 8 + i_length_padded, 0,
i_fz - i_length_padded - 8 );
}
}