* 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
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
/*****************************************************************************
* Local structures
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 %d to %d, resetting everything.",
+ p_filter->p_sys->i_frame_size, 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_libvlc->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 );
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++ )
{
+ uint16_t i_length_padded = i_length;
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);
/* 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 );
+ p_filter->p_libvlc->pf_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 );
+ p_filter->p_libvlc->pf_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;
p_tmp += 2; p_in += 2;
}
#endif
+ /* 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
{
- p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
+ p_filter->p_libvlc->pf_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 );
+ p_filter->p_libvlc->pf_memset( p_out + 8 + i_length_padded, 0,
+ i_fz - i_length_padded - 8 );
}
}