# include "config.h"
#endif
+#include <math.h>
#include <assert.h>
#include <vlc_common.h>
static void U16LDecode( void *, const uint8_t *, unsigned );
static void S16IDecode( void *, const uint8_t *, unsigned );
static void S20BDecode( void *, const uint8_t *, unsigned );
+static void U24BDecode( void *, const uint8_t *, unsigned );
+static void U24LDecode( void *, const uint8_t *, unsigned );
+static void S24BDecode( void *, const uint8_t *, unsigned );
+static void S24LDecode( void *, const uint8_t *, unsigned );
+static void S24B32Decode( void *, const uint8_t *, unsigned );
+static void S24L32Decode( void *, const uint8_t *, unsigned );
static void U32BDecode( void *, const uint8_t *, unsigned );
static void U32LDecode( void *, const uint8_t *, unsigned );
static void S32IDecode( void *, const uint8_t *, unsigned );
+static void F32NDecode( void *, const uint8_t *, unsigned );
+static void F32IDecode( void *, const uint8_t *, unsigned );
+static void F64NDecode( void *, const uint8_t *, unsigned );
+static void F64IDecode( void *, const uint8_t *, unsigned );
static void DAT12Decode( void *, const uint8_t *, unsigned );
/*****************************************************************************
switch( p_dec->fmt_in.i_codec )
{
case VLC_FOURCC('a','r','a','w'):
- case VLC_FOURCC('p','c','m',' '):
case VLC_FOURCC('a','f','l','t'):
/* _signed_ big endian samples (mov) */
case VLC_FOURCC('t','w','o','s'):
switch( format )
{
+#ifdef WORDS_BIGENDIAN
case VLC_CODEC_F64L:
+#else
case VLC_CODEC_F64B:
+#endif
+ format = VLC_CODEC_FL64;
+ decode = F64IDecode;
+ bits = 64;
+ break;
+ case VLC_CODEC_FL64:
+ decode = F64NDecode;
bits = 64;
break;
+#ifdef WORDS_BIGENDIAN
case VLC_CODEC_F32L:
+#else
case VLC_CODEC_F32B:
+#endif
+ format = VLC_CODEC_FL32;
+ decode = F32IDecode;
+ bits = 32;
+ break;
+ case VLC_CODEC_FL32:
+ decode = F32NDecode;
bits = 32;
break;
case VLC_CODEC_U32B:
case VLC_CODEC_S32I:
format = VLC_CODEC_S32N;
decode = S32IDecode;
- case VLC_CODEC_S32N:
+ case VLC_CODEC_S32N:
bits = 32;
break;
- case VLC_CODEC_S24L:
+ case VLC_CODEC_S24B32:
+ format = VLC_CODEC_S32N;
+ decode = S24B32Decode;
+ bits = 32;
+ break;
+ case VLC_CODEC_S24L32:
+ format = VLC_CODEC_S32N;
+ decode = S24L32Decode;
+ bits = 32;
+ break;
+ case VLC_CODEC_U24B:
+ format = VLC_CODEC_S32N;
+ decode = U24BDecode;
+ bits = 24;
+ break;
+ case VLC_CODEC_U24L:
+ format = VLC_CODEC_S32N;
+ decode = U24LDecode;
+ bits = 24;
+ break;
case VLC_CODEC_S24B:
+ format = VLC_CODEC_S32N;
+ decode = S24BDecode;
+ bits = 24;
+ break;
+ case VLC_CODEC_S24L:
+ format = VLC_CODEC_S32N;
+ decode = S24LDecode;
bits = 24;
break;
case VLC_CODEC_S20B:
static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
-
- if( !pp_block || !*pp_block ) return NULL;
+ if( pp_block == NULL )
+ return NULL;
block_t *p_block = *pp_block;
+ if( p_block == NULL )
+ return NULL;
+ *pp_block = NULL;
if( p_block->i_pts > VLC_TS_INVALID &&
p_block->i_pts != date_Get( &p_sys->end_date ) )
date_Set( &p_sys->end_date, p_block->i_pts );
}
else if( !date_Get( &p_sys->end_date ) )
- {
/* We've just started the stream, wait for the first PTS. */
- block_Release( p_block );
- return NULL;
- }
-
- /* Don't re-use the same pts twice */
- p_block->i_pts = VLC_TS_INVALID;
+ goto skip;
unsigned samples = (8 * p_block->i_buffer) / p_sys->framebits;
if( samples == 0 )
- {
- block_Release( p_block );
- return NULL;
- }
-
- /* Create chunks of max 1024 samples */
- if( samples > 1024 ) samples = 1024;
+ goto skip;
- block_t *p_out = decoder_NewAudioBuffer( p_dec, samples );
- if( p_out == NULL )
+ if( p_sys->decode != NULL )
{
- block_Release( p_block );
- return NULL;
- }
-
- p_out->i_pts = date_Get( &p_sys->end_date );
- p_out->i_length = date_Increment( &p_sys->end_date, samples )
- - p_out->i_pts;
+ block_t *p_out = decoder_NewAudioBuffer( p_dec, samples );
+ if( p_out == NULL )
+ goto skip;
- if( p_sys->decode != NULL )
p_sys->decode( p_out->p_buffer, p_block->p_buffer,
samples * p_dec->fmt_in.audio.i_channels );
+ block_Release( p_block );
+ p_block = p_out;
+ }
else
- memcpy( p_out->p_buffer, p_block->p_buffer, p_out->i_buffer );
-
- samples = (samples * p_sys->framebits) / 8;
- p_block->p_buffer += samples;
- p_block->i_buffer -= samples;
+ {
+ decoder_UpdateAudioFormat( p_dec );
+ p_block->i_nb_samples = samples;
+ p_block->i_buffer = samples * (p_sys->framebits / 8);
+ }
- return p_out;
+ p_block->i_pts = date_Get( &p_sys->end_date );
+ p_block->i_length = date_Increment( &p_sys->end_date, samples )
+ - p_block->i_pts;
+ return p_block;
+skip:
+ block_Release( p_block );
+ return NULL;
}
static void S8Decode( void *outp, const uint8_t *in, unsigned samples )
*(out++) = (U16_AT(in) << 16) | ((in[2] & 0xF0) << 8);
}
+static void U24BDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = ((in[0] << 24) | (in[1] << 16) | (in[2] << 8)) - 0x80000000;
+ *(out++) = s;
+ in += 3;
+ }
+}
+
+static void U24LDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = ((in[2] << 24) | (in[1] << 16) | (in[0] << 8)) - 0x80000000;
+ *(out++) = s;
+ in += 3;
+ }
+}
+
+static void S24BDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = ((in[0] << 24) | (in[1] << 16) | (in[2] << 8));
+ *(out++) = s;
+ in += 3;
+ }
+}
+
+static void S24LDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = ((in[2] << 24) | (in[1] << 16) | (in[0] << 8));
+ *(out++) = s;
+ in += 3;
+ }
+}
+
+static void S24B32Decode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ *(out++) = GetDWBE( in ) << 8;
+ in += 4;
+ }
+}
+
+static void S24L32Decode( void *outp, const uint8_t *in, unsigned samples )
+{
+ uint32_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ *(out++) = GetDWLE( in ) << 8;
+ in += 4;
+ }
+}
+
static void U32BDecode( void *outp, const uint8_t *in, unsigned samples )
{
uint32_t *out = outp;
}
}
-static int16_t dat12tos16( uint16_t y )
+static void F32NDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ float *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ memcpy( out, in, sizeof(float) );
+ if( unlikely(!isfinite(*out)) )
+ *out = 0.f;
+ out++;
+ in += sizeof(float);
+ }
+}
+
+static void F32IDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ float *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ union { float f; uint32_t u; } s;
+
+#ifdef WORDS_BIGENDIAN
+ s.u = GetDWLE( in );
+#else
+ s.u = GetDWBE( in );
+#endif
+ if( unlikely(!isfinite(s.f)) )
+ s.f = 0.f;
+ *(out++) = s.f;
+ in += 4;
+ }
+}
+
+static void F64NDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ double *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ memcpy( out, in, sizeof(double) );
+ if( unlikely(!isfinite( *out )) )
+ *out = 0.;
+ out++;
+ in += sizeof(double);
+ }
+}
+
+static void F64IDecode( void *outp, const uint8_t *in, unsigned samples )
+{
+ double *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ union { double d; uint64_t u; } s;
+
+#ifdef WORDS_BIGENDIAN
+ s.u = GetQWLE( in );
+#else
+ s.u = GetQWBE( in );
+#endif
+ if( unlikely(!isfinite( s.d )) )
+ s.d = 0.;
+ *(out++) = s.d;
+ in += 8;
+ }
+}
+
+static int16_t dat12tos16( uint_fast16_t y )
{
static const uint16_t diff[16] = {
0x0000, 0x0000, 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600,
static const uint8_t shift[16] = {
0, 0, 1, 2, 3, 4, 5, 6, 6, 5, 4, 3, 2, 1, 0, 0 };
+ assert(y < 0x1000);
+
int d = y >> 8;
return (y - diff[d]) << shift[d];
}
*(out++) = *(in++) + 0x8000;
}
+static void U24BEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const uint32_t *in = (const uint32_t *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = *(in++);
+ *(out++) = (s >> 24) + 0x80;
+ *(out++) = (s >> 16);
+ *(out++) = (s >> 8);
+ }
+}
+
+static void U24LEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const uint32_t *in = (const uint32_t *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = *(in++);
+ *(out++) = (s >> 8);
+ *(out++) = (s >> 16);
+ *(out++) = (s >> 24) + 0x80;
+ }
+}
+
+static void S24BEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const uint32_t *in = (const uint32_t *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = *(in++);
+ *(out++) = (s >> 24);
+ *(out++) = (s >> 16);
+ *(out++) = (s >> 8);
+ }
+}
+
+static void S24LEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const uint32_t *in = (const uint32_t *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ uint32_t s = *(in++);
+ *(out++) = (s >> 8);
+ *(out++) = (s >> 16);
+ *(out++) = (s >> 24);
+ }
+}
+
static void U32IEncode( void *outp, const uint8_t *inp, unsigned samples )
{
const uint32_t *in = (const uint32_t *)inp;
*(out++) = bswap32( *(in++) );
}
+static void F32IEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const float *in = (const float *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ union { float f; uint32_t u; char b[4]; } s;
+
+ s.f = *(in++);
+ s.u = bswap32( s.u );
+ memcpy( out, s.b, 4 );
+ out += 4;
+ }
+}
+
+static void F64IEncode( void *outp, const uint8_t *inp, unsigned samples )
+{
+ const double *in = (const double *)inp;
+ uint8_t *out = outp;
+
+ for( size_t i = 0; i < samples; i++ )
+ {
+ union { double d; uint64_t u; char b[8]; } s;
+
+ s.d = *(in++);
+ s.u = bswap64( s.u );
+ memcpy( out, s.b, 8 );
+ out += 8;
+ }
+}
+
static block_t *Encode( encoder_t *enc, block_t *in )
{
if( in == NULL )
out->i_dts = in->i_dts;
out->i_pts = in->i_pts;
out->i_length = in->i_length;
- out->i_nb_samples = in->i_nb_samples;
void (*encode)(void *, const uint8_t *, unsigned) = (void *)enc->p_sys;
if( encode != NULL )
encode( out->p_buffer, in->p_buffer, in->i_nb_samples
* enc->fmt_out.audio.i_channels );
- else
+ else {
+ assert( out->i_buffer >= in->i_buffer );
memcpy( out->p_buffer, in->p_buffer, in->i_buffer );
+ }
return out;
}
p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
p_enc->fmt_out.audio.i_bitspersample = 16;
break;
- case VLC_CODEC_U24L:
case VLC_CODEC_U24B:
- case VLC_CODEC_S24L:
+ encode = U24BEncode;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S32N;
+ p_enc->fmt_out.audio.i_bitspersample = 24;
+ break;
+ case VLC_CODEC_U24L:
+ encode = U24LEncode;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S32N;
+ p_enc->fmt_out.audio.i_bitspersample = 24;
+ break;
case VLC_CODEC_S24B:
+ encode = S24BEncode;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S32N;
+ p_enc->fmt_out.audio.i_bitspersample = 24;
+ break;
+ case VLC_CODEC_S24L:
+ encode = S24LEncode;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S32N;
p_enc->fmt_out.audio.i_bitspersample = 24;
break;
case VLC_CODEC_U32I:
p_enc->fmt_in.i_codec = VLC_CODEC_S32N;
p_enc->fmt_out.audio.i_bitspersample = 32;
break;
+#ifdef WORDS_BIGENDIAN
+ case VLC_CODEC_F32L:
+#else
+ case VLC_CODEC_F32B:
+#endif
+ encode = F32IEncode;
case VLC_CODEC_FL32:
+ p_enc->fmt_in.i_codec = VLC_CODEC_FL32;
p_enc->fmt_out.audio.i_bitspersample = 32;
break;
+#ifdef WORDS_BIGENDIAN
+ case VLC_CODEC_F64L:
+#else
+ case VLC_CODEC_F64B:
+#endif
+ encode = F64IEncode;
case VLC_CODEC_FL64:
+ p_enc->fmt_in.i_codec = VLC_CODEC_FL64;
p_enc->fmt_out.audio.i_bitspersample = 64;
break;
default:
projects / vlc / blobdiff