Commit ec3df8f4 authored by Ilkka Ollakka's avatar Ilkka Ollakka

aout: add deinterleave helper for doing packet->planar for audio samples

parent 6d6342b4
......@@ -214,6 +214,8 @@ VLC_API void aout_ChannelReorder(void *, size_t, unsigned, const uint8_t *, vlc_
VLC_API void aout_Interleave(void *dst, const void *src, unsigned samples,
unsigned channels, vlc_fourcc_t fourcc);
VLC_API void aout_Deinterleave(void *dst, const void *src, unsigned samples,
unsigned channels, vlc_fourcc_t fourcc);
/**
* This fonction will compute the extraction parameter into pi_selection to go
......
......@@ -376,6 +376,42 @@ do { \
#undef INTERLEAVE_TYPE
}
/**
* Deinterleaves audio samples within a block of samples.
* \param dst destination buffer for planar samples
* \param src source buffer with interleaved samples
* \param samples number of samples (per channel/per plane)
* \param chans channels/planes count
* \param fourcc sample format (must be a linear sample format)
* \note The samples must be naturally aligned in memory.
* \warning Destination and source buffers MUST NOT overlap.
*/
void aout_Deinterleave( void *restrict dst, const void *restrict src,
unsigned samples, unsigned chans, vlc_fourcc_t fourcc )
{
#define DEINTERLEAVE_TYPE(type) \
do { \
type *d = dst; \
const type *s = src; \
for( size_t i = 0; i < chans; i++ ) { \
for( size_t j = 0, k = 0; j < samples; j++, k += chans ) \
*(d++) = s[k]; \
s++; \
} \
} while(0)
switch( fourcc )
{
case VLC_CODEC_U8: DEINTERLEAVE_TYPE(uint8_t); break;
case VLC_CODEC_S16N: DEINTERLEAVE_TYPE(uint16_t); break;
case VLC_CODEC_FL32: DEINTERLEAVE_TYPE(float); break;
case VLC_CODEC_S32N: DEINTERLEAVE_TYPE(int32_t); break;
case VLC_CODEC_FL64: DEINTERLEAVE_TYPE(double); break;
default: assert(0);
}
#undef DEINTERLEAVE_TYPE
}
/*****************************************************************************
* aout_ChannelExtract:
*****************************************************************************/
......
......@@ -6,6 +6,7 @@ aout_ChannelReorder
aout_CheckChannelExtraction
aout_CheckChannelReorder
aout_Interleave
aout_Deinterleave
aout_filter_RequestVout
aout_FormatPrepare
aout_FormatPrint
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment