Skip to content

V
vlc-2-2
Commit 27de2641 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

tremor: decode to S32N

parent 23e8e0cd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/codec/vorbis.c
View file @ 27de2641
...@@ -253,7 +253,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -253,7 +253,7 @@ static int OpenDecoder( vlc_object_t *p_this )
/* Set output properties */ /* Set output properties */
p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_cat = AUDIO_ES;
#ifdef MODULE_NAME_IS_tremor #ifdef MODULE_NAME_IS_tremor
p_dec->fmt_out.i_codec = VLC_CODEC_FI32; p_dec->fmt_out.i_codec = VLC_CODEC_S32N;
#else #else
p_dec->fmt_out.i_codec = VLC_CODEC_FL32; p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
#endif #endif
...@@ -475,11 +475,11 @@ static void Interleave( INTERLEAVE_TYPE *p_out, const INTERLEAVE_TYPE **pp_in, ...@@ -475,11 +475,11 @@ static void Interleave( INTERLEAVE_TYPE *p_out, const INTERLEAVE_TYPE **pp_in,
{ {
for( int j = 0; j < i_samples; j++ ) for( int j = 0; j < i_samples; j++ )
for( int i = 0; i < i_nb_channels; i++ ) for( int i = 0; i < i_nb_channels; i++ )
p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j]
#ifdef MODULE_NAME_IS_tremor #ifdef MODULE_NAME_IS_tremor
* (FIXED32_ONE >> 24) p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j] << 8;
#else
p_out[j * i_nb_channels + pi_chan_table[i]] = pp_in[i][j];
#endif #endif
;
} }
/***************************************************************************** /*****************************************************************************
......
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