faad.c 16.4 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_common.h>
30
#include <vlc_plugin.h>
31
#include <vlc_input.h>
Clément Stenac's avatar
Clément Stenac committed
32 33
#include <vlc_aout.h>
#include <vlc_codec.h>
34 35 36 37 38 39 40

#include <faad.h>

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

43 44 45 46 47 48 49
vlc_module_begin ()
    set_description( N_("AAC audio decoder (using libfaad2)") )
    set_capability( "decoder", 100 )
    set_category( CAT_INPUT )
    set_subcategory( SUBCAT_INPUT_ACODEC )
    set_callbacks( Open, Close )
vlc_module_end ()
50 51 52 53

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

#define MAX_CHANNEL_POSITIONS 9
58 59 60 61 62 63 64

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

    /* samples */
65
    date_t date;
66 67

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

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

75
    bool b_sbr, b_ps;
76 77
};

Gildas Bazin's avatar
 
Gildas Bazin committed
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
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
    };
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
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
110

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

120
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
121
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
122 123 124 125
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
126
    if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
127
        return VLC_ENOMEM;
128 129 130 131

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

Gildas Bazin's avatar
 
Gildas Bazin committed
136
    /* Misc init */
137
    date_Set( &p_sys->date, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
138
    p_dec->fmt_out.i_cat = AUDIO_ES;
139

140
    if (vlc_CPU() & CPU_CAPABILITY_FPU)
141
        p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
142
    else
143
        p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
Gildas Bazin's avatar
 
Gildas Bazin committed
144 145
    p_dec->pf_decode_audio = DecodeBlock;

Gildas Bazin's avatar
 
Gildas Bazin committed
146 147 148
    p_dec->fmt_out.audio.i_physical_channels =
        p_dec->fmt_out.audio.i_original_channels = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
149
    if( p_dec->fmt_in.i_extra > 0 )
150 151
    {
        /* We have a decoder config so init the handle */
Gildas Bazin's avatar
 
Gildas Bazin committed
152 153
        unsigned long i_rate;
        unsigned char i_channels;
154

Gildas Bazin's avatar
 
Gildas Bazin committed
155 156
        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
157 158
                          &i_rate, &i_channels ) < 0 )
        {
159
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
160 161 162
            return VLC_EGENERIC;
        }

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

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

    /* buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
186
    p_sys->i_buffer = p_sys->i_buffer_size = 0;
187
    p_sys->p_buffer = NULL;
188

189
    /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
190
    p_dec->b_need_packetized = true;
191

192
    p_sys->b_sbr = p_sys->b_ps = false;
193 194 195 196
    return VLC_SUCCESS;
}

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
197
 * DecodeBlock:
198
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
199
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
200 201
{
    decoder_sys_t *p_sys = p_dec->p_sys;
Gildas Bazin's avatar
 
Gildas Bazin committed
202
    block_t *p_block;
203

Gildas Bazin's avatar
 
Gildas Bazin committed
204 205 206
    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
207

Laurent Aimar's avatar
Laurent Aimar committed
208
    if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
209 210 211 212 213
    {
        block_Release( p_block );
        return NULL;
    }

214 215 216 217 218 219 220 221 222 223 224
    /* Remove ADTS header if we have decoder specific config */
    if( p_dec->fmt_in.i_extra && p_block->i_buffer > 7 )
    {
        if( p_block->p_buffer[0] == 0xff &&
            ( p_block->p_buffer[1] & 0xf0 ) == 0xf0 ) /* syncword */
        {   /* ADTS header present */
            size_t i_header_size; /* 7 bytes (+ 2 bytes for crc) */
            i_header_size = 7 + ( ( p_block->p_buffer[1] & 0x01 ) ? 0 : 2 );
            /* FIXME: multiple blocks per frame */
            if( p_block->i_buffer > i_header_size )
            {
225
                p_block->p_buffer += i_header_size;
226 227 228 229 230
                p_block->i_buffer -= i_header_size;
            }
        }
    }

231 232 233
    /* 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
234
        p_sys->i_buffer_size = p_sys->i_buffer + p_block->i_buffer;
235 236 237
        p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size );
    }

238
    if( p_block->i_buffer > 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
239
    {
240
        vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
241
                     p_block->p_buffer, p_block->i_buffer );
Gildas Bazin's avatar
 
Gildas Bazin committed
242 243 244 245
        p_sys->i_buffer += p_block->i_buffer;
        p_block->i_buffer = 0;
    }

246 247 248 249 250 251 252 253 254 255 256 257
    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;
258 259 260 261
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[i_channels];

262
            date_Init( &p_sys->date, i_rate, 1 );
263 264 265
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
266
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
267
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
268 269
        unsigned long i_rate;
        unsigned char i_channels;
270 271 272 273 274 275

        /* Init faad with the first frame */
        if( faacDecInit( p_sys->hfaad,
                         p_sys->p_buffer, p_sys->i_buffer,
                         &i_rate, &i_channels ) < 0 )
        {
276
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
277
            return NULL;
278
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
279 280 281

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
282 283 284
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
285
        date_Init( &p_sys->date, i_rate, 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
286 287
    }

288
    if( p_block->i_pts != 0 && p_block->i_pts != date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
289
    {
290
        date_Set( &p_sys->date, p_block->i_pts );
Gildas Bazin's avatar
 
Gildas Bazin committed
291
    }
292
    else if( !date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
293 294 295 296 297
    {
        /* We've just started the stream, wait for the first PTS. */
        block_Release( p_block );
        p_sys->i_buffer = 0;
        return NULL;
298 299 300
    }

    /* Decode all data */
Gildas Bazin's avatar
 
Gildas Bazin committed
301
    if( p_sys->i_buffer )
302 303 304
    {
        void *samples;
        faacDecFrameInfo frame;
Gildas Bazin's avatar
 
Gildas Bazin committed
305
        aout_buffer_t *p_out;
Gildas Bazin's avatar
 
Gildas Bazin committed
306
        int i, j;
307 308

        samples = faacDecDecode( p_sys->hfaad, &frame,
Gildas Bazin's avatar
 
Gildas Bazin committed
309
                                 p_sys->p_buffer, p_sys->i_buffer );
310 311 312 313

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

            /* Flush the buffer */
316
            p_sys->i_buffer = 0;
317
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
318
            return NULL;
319
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
320

Gildas Bazin's avatar
 
Gildas Bazin committed
321
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
322
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
323
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
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
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
335

336 337
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
338
            msg_Warn( p_dec, "decoded zero sample" );
Gildas Bazin's avatar
 
Gildas Bazin committed
339 340

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
341 342 343 344 345 346
            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 );
            }
347
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
348
            return NULL;
349 350
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
351 352
        /* We decoded a valid frame */
        if( p_dec->fmt_out.audio.i_rate != frame.samplerate )
353
        {
354 355
            date_Init( &p_sys->date, frame.samplerate, 1 );
            date_Set( &p_sys->date, p_block->i_pts );
356
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
357
        p_block->i_pts = 0;  /* PTS is valid only once */
358

Gildas Bazin's avatar
 
Gildas Bazin committed
359 360
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
        p_dec->fmt_out.audio.i_channels = frame.channels;
361 362 363
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[frame.channels];
364

365
        /* Adjust stream info when dealing with SBR/PS */
366
        if( p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps )
367
        {
368
            const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
Laurent Aimar's avatar
Laurent Aimar committed
369
                                    frame.sbr ? "SBR" : "PS";
370

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

374 375 376 377 378
            if( !p_dec->p_description )
                p_dec->p_description = vlc_meta_New();
            if( p_dec->p_description )
                vlc_meta_AddExtra( p_dec->p_description, _("AAC extension"), psz_ext );

379
            p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
380
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
381 382

        /* Convert frame.channel_position to our own channel values */
383
        p_dec->fmt_out.audio.i_physical_channels = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
384 385 386 387 388 389 390 391
        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;
            }
392
            if( j >= MAX_CHANNEL_POSITIONS )
393
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
394
                msg_Warn( p_dec, "unknown channel ordering" );
395 396
                /* Invent something */
                j = i;
397
            }
398 399 400 401 402 403
            /* */
            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
404 405 406 407
        }
        p_dec->fmt_out.audio.i_original_channels =
            p_dec->fmt_out.audio.i_physical_channels;

408
        p_out = decoder_NewAudioBuffer(p_dec, frame.samples/frame.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
409
        if( p_out == NULL )
410
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
411
            p_sys->i_buffer = 0;
412
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
413
            return NULL;
414 415
        }

416 417
        p_out->start_date = date_Get( &p_sys->date );
        p_out->end_date = date_Increment( &p_sys->date, frame.samples / frame.channels );
Gildas Bazin's avatar
 
Gildas Bazin committed
418

419
        DoReordering( (uint32_t *)p_out->p_buffer, samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
420 421
                      frame.samples / frame.channels, frame.channels,
                      p_sys->pi_channel_positions );
422

Gildas Bazin's avatar
 
Gildas Bazin committed
423 424
        p_sys->i_buffer -= frame.bytesconsumed;
        if( p_sys->i_buffer > 0 )
425
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
426 427
            memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
                     p_sys->i_buffer );
428 429
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
430
        return p_out;
431 432
    }

433
    block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
434
    return NULL;
435 436 437
}

/*****************************************************************************
438
 * Close:
439
 *****************************************************************************/
440
static void Close( vlc_object_t *p_this )
441
{
Gildas Bazin's avatar
 
Gildas Bazin committed
442
    decoder_t *p_dec = (decoder_t *)p_this;
443 444 445
    decoder_sys_t *p_sys = p_dec->p_sys;

    faacDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
446
    free( p_sys->p_buffer );
447 448
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
449 450 451 452 453

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
454
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
455 456 457 458 459 460
                          int i_nb_channels, uint32_t *pi_chan_positions )
{
    int pi_chan_table[MAX_CHANNEL_POSITIONS];
    int i, j, k;

    /* Find the channels mapping */
461
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
462
    {
463
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
464 465 466 467 468 469 470 471 472 473
        {
            if( pi_channels_ordered[i] == pi_chan_positions[k] )
            {
                pi_chan_table[k] = j++;
                break;
            }
        }
    }

    /* Do the actual reordering */
474
    if( vlc_CPU() & CPU_CAPABILITY_FPU )
475 476 477 478 479 480 481 482 483
        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
484
}
485