return VLC_SUCCESS;;
}
+union dw
+{
+ float f;
+ int32_t s;
+ uint32_t u;
+};
+
/*****************************************************************************
* F32 to S16
*****************************************************************************/
/*** Conversions from decoders to FI32 */
static block_t *Do_FL32ToF32( filter_t *, block_t * );
+static block_t *Do_S32ToF32( filter_t *, block_t * );
static block_t *Do_S16ToF32( filter_t *, block_t * );
static block_t *Do_U8ToF32( filter_t *, block_t * );
p_filter->pf_audio_filter = Do_FL32ToF32;
break;
+ case VLC_CODEC_S32N:
+ p_filter->pf_audio_filter = Do_S32ToF32;
+ break;
+
case VLC_CODEC_S16N:
p_filter->pf_audio_filter = Do_S16ToF32;
break;
static block_t *Do_FL32ToF32( filter_t * p_filter, block_t * p_in_buf )
{
- const float * p_in = (float *)p_in_buf->p_buffer;
- vlc_fixed_t * p_out = (vlc_fixed_t *)p_in_buf->p_buffer;
+ unsigned count = p_in_buf->i_nb_samples
+ * aout_FormatNbChannels( &p_filter->fmt_in.audio );
+ union dw *restrict p = (union dw *)p_in_buf->p_buffer, *end = p + count;
+ const float one = FIXED32_ONE;
- for ( unsigned i = p_in_buf->i_nb_samples
- * aout_FormatNbChannels( &p_filter->fmt_in.audio ) ; i-- ; )
+ while (p < end)
+ {
+ p->s = (one * p->f);
+ p++;
+ }
+ return p_in_buf;
+}
+
+static block_t *Do_S32ToF32( filter_t * p_filter, block_t * p_in_buf )
+{
+ unsigned count = p_in_buf->i_nb_samples
+ * aout_FormatNbChannels( &p_filter->fmt_in.audio );
+ int32_t *restrict p = (int32_t *)p_in_buf->p_buffer, *end = p + count;
+
+ while (p < end)
{
- *p_out++ = (vlc_fixed_t)( *p_in++ * (float)FIXED32_ONE );
+ *p = *p >> 3;
+ p++;
}
return p_in_buf;
}