faad.c 15.9 KB
Newer Older
1 2 3
/*****************************************************************************
 * decoder.c: AAC decoder using libfaad2
 *****************************************************************************
4
 * Copyright (C) 2001, 2003 the VideoLAN team
5
 * $Id$
6 7
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
 *          Gildas Bazin <gbazin@videolan.org>
9 10 11 12 13 14 15 16 17 18 19 20 21
 *
 * This program is free software; you can redistribute it and/or modify
 * 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
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
Antoine Cellerier's avatar
Antoine Cellerier committed
22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23 24
 *****************************************************************************/

25 26 27 28
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

29
#include <vlc/vlc.h>
Clément Stenac's avatar
Clément Stenac committed
30 31 32
#include <vlc_aout.h>
#include <vlc_codec.h>
#include <vlc_input.h>
33 34 35 36 37 38 39

#include <faad.h>

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open( vlc_object_t * );
40
static void Close( vlc_object_t * );
41 42 43

vlc_module_begin();
    set_description( _("AAC audio decoder (using libfaad2)") );
44
    set_capability( "decoder", 100 );
Clément Stenac's avatar
Clément Stenac committed
45 46
    set_category( CAT_INPUT );
    set_subcategory( SUBCAT_INPUT_ACODEC );
47
    set_callbacks( Open, Close );
48 49 50 51 52
vlc_module_end();

/****************************************************************************
 * Local prototypes
 ****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
53
static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
54
static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
55 56

#define MAX_CHANNEL_POSITIONS 9
57 58 59 60 61 62 63

struct decoder_sys_t
{
    /* faad handler */
    faacDecHandle *hfaad;

    /* samples */
Gildas Bazin's avatar
 
Gildas Bazin committed
64
    audio_date_t date;
65 66

    /* temporary buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
67 68
    uint8_t *p_buffer;
    int     i_buffer;
69
    size_t  i_buffer_size;
70

Gildas Bazin's avatar
 
Gildas Bazin committed
71 72
    /* Channel positions of the current stream (for re-ordering) */
    uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS];
73 74

    vlc_bool_t b_sbr, b_ps;
75 76

    int i_input_rate;
77 78
};

Gildas Bazin's avatar
 
Gildas Bazin committed
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] =
    { FRONT_CHANNEL_CENTER, FRONT_CHANNEL_LEFT, FRONT_CHANNEL_RIGHT,
      SIDE_CHANNEL_LEFT, SIDE_CHANNEL_RIGHT,
      BACK_CHANNEL_LEFT, BACK_CHANNEL_RIGHT,
      BACK_CHANNEL_CENTER, LFE_CHANNEL };
static const uint32_t pi_channels_out[MAX_CHANNEL_POSITIONS] =
    { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE };
static const uint32_t pi_channels_ordered[MAX_CHANNEL_POSITIONS] =
    { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_CENTER, AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE
    };
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
static const uint32_t pi_channels_guessed[MAX_CHANNEL_POSITIONS] =
    { 0, AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_LFE,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT
          | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
          | AOUT_CHAN_CENTER,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT
          | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
          | AOUT_CHAN_CENTER | AOUT_CHAN_LFE
    };
Gildas Bazin's avatar
 
Gildas Bazin committed
111

112
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
113
 * OpenDecoder: probe the decoder and return score
114
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
115
static int Open( vlc_object_t *p_this )
116
{
Gildas Bazin's avatar
 
Gildas Bazin committed
117
    decoder_t *p_dec = (decoder_t*)p_this;
118 119 120
    decoder_sys_t *p_sys = p_dec->p_sys;
    faacDecConfiguration *cfg;

Gildas Bazin's avatar
 
Gildas Bazin committed
121
    if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') )
122
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
123 124 125 126 127 128 129 130 131
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
    if( ( p_dec->p_sys = p_sys =
          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
    {
        msg_Err( p_dec, "out of memory" );
        return VLC_EGENERIC;
132 133 134 135 136
    }

    /* Open a faad context */
    if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
    {
Benjamin Pracht's avatar
Benjamin Pracht committed
137
        msg_Err( p_dec, "cannot initialize faad" );
138 139 140
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
141 142 143
    /* Misc init */
    aout_DateSet( &p_sys->date, 0 );
    p_dec->fmt_out.i_cat = AUDIO_ES;
144

145
    if (vlc_CPU() & CPU_CAPABILITY_FPU)
146 147
        p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
    else
148
        p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
Gildas Bazin's avatar
 
Gildas Bazin committed
149 150
    p_dec->pf_decode_audio = DecodeBlock;

Gildas Bazin's avatar
 
Gildas Bazin committed
151 152 153
    p_dec->fmt_out.audio.i_physical_channels =
        p_dec->fmt_out.audio.i_original_channels = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
154
    if( p_dec->fmt_in.i_extra > 0 )
155 156
    {
        /* We have a decoder config so init the handle */
Gildas Bazin's avatar
 
Gildas Bazin committed
157 158
        unsigned long i_rate;
        unsigned char i_channels;
159

Gildas Bazin's avatar
 
Gildas Bazin committed
160 161
        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
162 163 164 165 166
                          &i_rate, &i_channels ) < 0 )
        {
            return VLC_EGENERIC;
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
167 168
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
169 170 171
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
Gildas Bazin's avatar
 
Gildas Bazin committed
172
        aout_DateInit( &p_sys->date, i_rate );
173 174 175 176
    }
    else
    {
        /* Will be initalised from first frame */
Gildas Bazin's avatar
 
Gildas Bazin committed
177 178
        p_dec->fmt_out.audio.i_rate = 0;
        p_dec->fmt_out.audio.i_channels = 0;
179 180
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
181
    /* Set the faad config */
182
    cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
183
    if (vlc_CPU() & CPU_CAPABILITY_FPU)
184 185
        cfg->outputFormat = FAAD_FMT_FLOAT;
    else
186
        cfg->outputFormat = FAAD_FMT_16BIT;
187 188 189
    faacDecSetConfiguration( p_sys->hfaad, cfg );

    /* buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
190 191
    p_sys->i_buffer = p_sys->i_buffer_size = 0;
    p_sys->p_buffer = 0;
192

193 194
    p_sys->i_input_rate = INPUT_RATE_DEFAULT;

195 196 197
    /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
    p_dec->b_need_packetized = VLC_TRUE;

198
    p_sys->b_sbr = p_sys->b_ps = VLC_FALSE;
199 200 201 202
    return VLC_SUCCESS;
}

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
203
 * DecodeBlock:
204
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
205
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
206 207
{
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
208
    block_t *p_block;
209

Gildas Bazin's avatar
 
Gildas Bazin committed
210 211 212
    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
213

Laurent Aimar's avatar
Laurent Aimar committed
214
    if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
215 216 217 218 219
    {
        block_Release( p_block );
        return NULL;
    }

220 221 222
    if( p_block->i_rate > 0 )
        p_sys->i_input_rate = p_block->i_rate;

223 224 225
    /* Append the block to the temporary buffer */
    if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
226
        p_sys->i_buffer_size = p_sys->i_buffer + p_block->i_buffer;
227 228 229
        p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size );
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
230 231 232 233 234 235 236 237
    if( p_block->i_buffer )
    {
        memcpy( &p_sys->p_buffer[p_sys->i_buffer],
                p_block->p_buffer, p_block->i_buffer );
        p_sys->i_buffer += p_block->i_buffer;
        p_block->i_buffer = 0;
    }

238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253
    if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 )
    {
        /* We have a decoder config so init the handle */
        unsigned long i_rate;
        unsigned char i_channels;

        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
                          &i_rate, &i_channels ) >= 0 )
        {
            p_dec->fmt_out.audio.i_rate = i_rate;
            p_dec->fmt_out.audio.i_channels = i_channels;
            aout_DateInit( &p_sys->date, i_rate );
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
254
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
255
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
256 257
        unsigned long i_rate;
        unsigned char i_channels;
258 259 260 261 262 263

        /* Init faad with the first frame */
        if( faacDecInit( p_sys->hfaad,
                         p_sys->p_buffer, p_sys->i_buffer,
                         &i_rate, &i_channels ) < 0 )
        {
264
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
265
            return NULL;
266
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
        aout_DateInit( &p_sys->date, i_rate );
    }

    if( p_block->i_pts != 0 && p_block->i_pts != aout_DateGet( &p_sys->date ) )
    {
        aout_DateSet( &p_sys->date, p_block->i_pts );
    }
    else if( !aout_DateGet( &p_sys->date ) )
    {
        /* We've just started the stream, wait for the first PTS. */
        block_Release( p_block );
        p_sys->i_buffer = 0;
        return NULL;
283 284 285
    }

    /* Decode all data */
Gildas Bazin's avatar
 
Gildas Bazin committed
286
    if( p_sys->i_buffer )
287 288 289
    {
        void *samples;
        faacDecFrameInfo frame;
Gildas Bazin's avatar
 
Gildas Bazin committed
290
        aout_buffer_t *p_out;
Gildas Bazin's avatar
 
Gildas Bazin committed
291
        int i, j;
292 293

        samples = faacDecDecode( p_sys->hfaad, &frame,
Gildas Bazin's avatar
 
Gildas Bazin committed
294
                                 p_sys->p_buffer, p_sys->i_buffer );
295 296 297 298

        if( frame.error > 0 )
        {
            msg_Warn( p_dec, "%s", faacDecGetErrorMessage( frame.error ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
299 300

            /* Flush the buffer */
301
            p_sys->i_buffer = 0;
302
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
303
            return NULL;
304
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
305

Gildas Bazin's avatar
 
Gildas Bazin committed
306
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
307
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
308
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
Gildas Bazin's avatar
 
Gildas Bazin committed
309 310

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
311 312 313 314 315 316
            p_sys->i_buffer -= frame.bytesconsumed;
            if( p_sys->i_buffer > 0 )
            {
                memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed],
                         p_sys->i_buffer );
            }
317
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
318
            return NULL;
319
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
320

321 322
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
323
            msg_Warn( p_dec, "decoded zero sample" );
Gildas Bazin's avatar
 
Gildas Bazin committed
324 325

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
326 327 328 329 330 331
            p_sys->i_buffer -= frame.bytesconsumed;
            if( p_sys->i_buffer > 0 )
            {
                memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed],
                         p_sys->i_buffer );
            }
332
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
333
            return NULL;
334 335
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
336 337
        /* We decoded a valid frame */
        if( p_dec->fmt_out.audio.i_rate != frame.samplerate )
338
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
339 340
            aout_DateInit( &p_sys->date, frame.samplerate );
            aout_DateSet( &p_sys->date, p_block->i_pts );
341
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
342
        p_block->i_pts = 0;  /* PTS is valid only once */
343

Gildas Bazin's avatar
 
Gildas Bazin committed
344 345
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
        p_dec->fmt_out.audio.i_channels = frame.channels;
346

347 348 349 350 351
        /* Adjust stream info when dealing with SBR/PS */
        if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
            p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
        {
          input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
Laurent Aimar's avatar
Laurent Aimar committed
352 353 354
          char *psz_cat;
          const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
                                    frame.sbr ? "SBR" : "PS";
355 356 357 358 359 360 361 362 363 364 365 366 367 368

          msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
                   psz_ext, frame.channels, frame.samplerate );

          asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id );
          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                          _("AAC extension"), "%s", psz_ext );
          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                         _("Channels"), "%d", frame.channels );
          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                         _("Sample rate"), _("%d Hz"), frame.samplerate );
          free( psz_cat );
          p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
369 370

        /* Convert frame.channel_position to our own channel values */
371
        p_dec->fmt_out.audio.i_physical_channels = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
372 373 374 375 376 377 378 379
        for( i = 0; i < frame.channels; i++ )
        {
            /* Find the channel code */
            for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ )
            {
                if( frame.channel_position[i] == pi_channels_in[j] )
                    break;
            }
380
            if( j >= MAX_CHANNEL_POSITIONS )
381
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
382
                msg_Warn( p_dec, "unknown channel ordering" );
383 384
                /* Invent something */
                j = i;
385
            }
386 387 388 389 390 391
            /* */
            p_sys->pi_channel_positions[i] = pi_channels_out[j];
            if( p_dec->fmt_out.audio.i_physical_channels & pi_channels_out[j] )
                frame.channels--; /* We loose a duplicated channel */
            else
                p_dec->fmt_out.audio.i_physical_channels |= pi_channels_out[j];
Gildas Bazin's avatar
 
Gildas Bazin committed
392 393 394 395 396
        }
        p_dec->fmt_out.audio.i_original_channels =
            p_dec->fmt_out.audio.i_physical_channels;

        p_out = p_dec->pf_aout_buffer_new(p_dec, frame.samples/frame.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
397
        if( p_out == NULL )
398
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
399
            p_sys->i_buffer = 0;
400
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
401
            return NULL;
402 403
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
404 405
        p_out->start_date = aout_DateGet( &p_sys->date );
        p_out->end_date = aout_DateIncrement( &p_sys->date,
406
            (frame.samples / frame.channels) * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
Gildas Bazin's avatar
 
Gildas Bazin committed
407

408
        DoReordering( (uint32_t *)p_out->p_buffer, samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
409 410
                      frame.samples / frame.channels, frame.channels,
                      p_sys->pi_channel_positions );
411

Gildas Bazin's avatar
 
Gildas Bazin committed
412 413
        p_sys->i_buffer -= frame.bytesconsumed;
        if( p_sys->i_buffer > 0 )
414
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
415 416
            memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
                     p_sys->i_buffer );
417 418
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
419
        return p_out;
420 421
    }

422
    block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
423
    return NULL;
424 425 426
}

/*****************************************************************************
427
 * Close:
428
 *****************************************************************************/
429
static void Close( vlc_object_t *p_this )
430
{
Gildas Bazin's avatar
 
Gildas Bazin committed
431
    decoder_t *p_dec = (decoder_t *)p_this;
432 433 434
    decoder_sys_t *p_sys = p_dec->p_sys;

    faacDecClose( p_sys->hfaad );
435
    if( p_sys->p_buffer ) free( p_sys->p_buffer );
436 437
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
438 439 440 441 442

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
443
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
444 445 446 447 448 449
                          int i_nb_channels, uint32_t *pi_chan_positions )
{
    int pi_chan_table[MAX_CHANNEL_POSITIONS];
    int i, j, k;

    /* Find the channels mapping */
450
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
451
    {
452
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
453 454 455 456 457 458 459 460 461 462
        {
            if( pi_channels_ordered[i] == pi_chan_positions[k] )
            {
                pi_chan_table[k] = j++;
                break;
            }
        }
    }

    /* Do the actual reordering */
463
    if( vlc_CPU() & CPU_CAPABILITY_FPU )
464 465 466 467 468 469 470 471 472
        for( i = 0; i < i_samples; i++ )
            for( j = 0; j < i_nb_channels; j++ )
                p_out[i * i_nb_channels + pi_chan_table[j]] =
                    p_in[i * i_nb_channels + j];
    else
        for( i = 0; i < i_samples; i++ )
            for( j = 0; j < i_nb_channels; j++ )
                ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
                    ((uint16_t *)p_in)[i * i_nb_channels + j];
Gildas Bazin's avatar
 
Gildas Bazin committed
473
}