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

Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
25 26 27 28 29 30 31 32
/*****************************************************************************
 * NOTA BENE: this module requires the linking against a library which is
 * known to require licensing under the GNU General Public License version 2
 * (or later). Therefore, the result of compiling this module will normally
 * be subject to the terms of that later license.
 *****************************************************************************/


33 34 35 36
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

37
#include <vlc_common.h>
38
#include <vlc_plugin.h>
39
#include <vlc_input.h>
Clément Stenac's avatar
Clément Stenac committed
40
#include <vlc_codec.h>
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
41
#include <vlc_cpu.h>
42

43
#include <neaacdec.h>
44 45 46 47 48

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open( vlc_object_t * );
49
static void Close( vlc_object_t * );
50

51 52 53 54 55 56 57
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 ()
58 59 60 61

/****************************************************************************
 * Local prototypes
 ****************************************************************************/
62
static int DecodeBlock( decoder_t *, block_t * );
63
static void Flush( decoder_t * );
64
static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
65 66

#define MAX_CHANNEL_POSITIONS 9
67 68 69 70

struct decoder_sys_t
{
    /* faad handler */
71
    NeAACDecHandle *hfaad;
72 73

    /* samples */
74
    date_t date;
75 76

    /* temporary buffer */
77
    block_t *p_block;
78

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

82
    bool b_sbr, b_ps, b_discontinuity;
83 84
};

Gildas Bazin's avatar
 
Gildas Bazin committed
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
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
    };
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116
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
117

118
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
119
 * OpenDecoder: probe the decoder and return score
120
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
121
static int Open( vlc_object_t *p_this )
122
{
Gildas Bazin's avatar
 
Gildas Bazin committed
123
    decoder_t *p_dec = (decoder_t*)p_this;
Rémi Duraffort's avatar
Rémi Duraffort committed
124
    decoder_sys_t *p_sys;
125
    NeAACDecConfiguration *cfg;
126

127
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
128
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
129 130 131 132
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
133
    if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
134
        return VLC_ENOMEM;
135 136

    /* Open a faad context */
137
    if( ( p_sys->hfaad = NeAACDecOpen() ) == NULL )
138
    {
Benjamin Pracht's avatar
Benjamin Pracht committed
139
        msg_Err( p_dec, "cannot initialize faad" );
Rémi Duraffort's avatar
Rémi Duraffort committed
140
        free( p_sys );
141 142 143
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
144
    /* Misc init */
145
    date_Set( &p_sys->date, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
146
    p_dec->fmt_out.i_cat = AUDIO_ES;
147

Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
148
    p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
Gildas Bazin's avatar
 
Gildas Bazin committed
149

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

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

159 160 161
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) < 0 )
162
        {
163
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
164
            NeAACDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
165
            free( p_sys );
166 167 168
            return VLC_EGENERIC;
        }

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

Gildas Bazin's avatar
 
Gildas Bazin committed
183
    /* Set the faad config */
184
    cfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
185 186
    if( p_dec->fmt_in.audio.i_rate )
        cfg->defSampleRate = p_dec->fmt_in.audio.i_rate;
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
187
    cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT;
188
    NeAACDecSetConfiguration( p_sys->hfaad, cfg );
189 190

    /* buffer */
191
    p_sys->p_block = NULL;
192

193
    p_sys->b_discontinuity =
194
    p_sys->b_sbr = p_sys->b_ps = false;
195

196 197
    p_dec->pf_decode = DecodeBlock;
    p_dec->pf_flush  = Flush;
198 199 200
    return VLC_SUCCESS;
}

201 202 203 204 205
/*****************************************************************************
 * FlushBuffer:
 *****************************************************************************/
static void FlushBuffer( decoder_sys_t *p_sys, size_t i_used )
{
206 207
    block_t *p_block = p_sys->p_block;
    if( p_block )
208
    {
209 210 211
        if( i_used < p_block->i_buffer )
        {
            /* Drop padding */
212 213 214
            for( ; i_used < p_block->i_buffer; i_used++ )
                if( p_block->p_buffer[i_used] != 0x00 )
                    break;
215

216 217 218 219 220
            p_block->i_buffer -= i_used;
            p_block->p_buffer += i_used;
        }
        else p_block->i_buffer = 0;
        if( p_block->i_buffer == 0 )
221
        {
222 223
            block_Release( p_block );
            p_sys->p_block = NULL;
224 225 226 227
        }
    }
}

228 229 230 231 232 233 234 235 236 237 238
/*****************************************************************************
 * Flush:
 *****************************************************************************/
static void Flush( decoder_t *p_dec )
{
    decoder_sys_t *p_sys = p_dec->p_sys;

    date_Set( &p_sys->date, VLC_TS_INVALID );
    FlushBuffer( p_sys, SIZE_MAX );
}

239
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
240
 * DecodeBlock:
241
 *****************************************************************************/
242
static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
243 244 245
{
    decoder_sys_t *p_sys = p_dec->p_sys;

246 247
    if( !p_block ) /* No Drain */
        return VLCDEC_SUCCESS;
248

249
    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED) )
250
    {
251
        Flush( p_dec );
252 253 254
        if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
        {
            block_Release( p_block );
255
            return VLCDEC_SUCCESS;
256
        }
257 258
    }

259 260 261 262 263 264 265 266 267 268 269
    /* 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 )
            {
270
                p_block->p_buffer += i_header_size;
271 272 273 274 275
                p_block->i_buffer -= i_header_size;
            }
        }
    }

276 277 278 279
    const mtime_t i_pts = p_block->i_pts;

    /* Append block as temporary buffer */
    if( p_sys->p_block == NULL )
280
    {
281
        p_sys->p_block = p_block;
282
    }
283
    else
Gildas Bazin's avatar
 
Gildas Bazin committed
284
    {
285 286 287 288 289
        p_sys->p_block->p_next = p_block;
        block_t *p_prev = p_sys->p_block;
        p_sys->p_block = block_ChainGather( p_sys->p_block );
        if( p_sys->p_block == NULL )
            block_ChainRelease( p_prev );
Gildas Bazin's avatar
 
Gildas Bazin committed
290 291
    }

292 293
    /* !Warn: do not use p_block beyond this point */

294 295 296 297 298 299
    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;

300 301 302
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) >= 0 )
303 304 305
        {
            p_dec->fmt_out.audio.i_rate = i_rate;
            p_dec->fmt_out.audio.i_channels = i_channels;
306 307 308 309
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[i_channels];

310
            date_Init( &p_sys->date, i_rate, 1 );
311 312 313
        }
    }

314
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->p_block && p_sys->p_block->i_buffer )
315
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
316 317
        unsigned long i_rate;
        unsigned char i_channels;
318 319

        /* Init faad with the first frame */
320
        if( NeAACDecInit( p_sys->hfaad,
321
                          p_sys->p_block->p_buffer, p_sys->p_block->i_buffer,
322
                          &i_rate, &i_channels ) < 0 )
323
        {
324
            return VLCDEC_SUCCESS;
325
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
326 327 328

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
329 330 331
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
332
        date_Init( &p_sys->date, i_rate, 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
333 334
    }

335
    if( i_pts > VLC_TS_INVALID && i_pts != date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
336
    {
337
        date_Set( &p_sys->date, i_pts );
Gildas Bazin's avatar
 
Gildas Bazin committed
338
    }
339
    else if( !date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
340 341
    {
        /* We've just started the stream, wait for the first PTS. */
342
        FlushBuffer( p_sys, SIZE_MAX );
343
        return VLCDEC_SUCCESS;
344 345 346
    }

    /* Decode all data */
347
    if( p_sys->p_block && p_sys->p_block->i_buffer > 1 )
348 349
    {
        void *samples;
350
        NeAACDecFrameInfo frame;
351
        block_t *p_out;
352

353
        samples = NeAACDecDecode( p_sys->hfaad, &frame,
354 355
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer );
356 357 358

        if( frame.error > 0 )
        {
359
            msg_Warn( p_dec, "%s", NeAACDecGetErrorMessage( frame.error ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
360

361
            if( frame.error == 21 || frame.error == 12 )
362 363
            {
                /*
364 365
                 * Once an "Unexpected channel configuration change"
                 * or a "Invalid number of channels" error
366 367 368 369 370
                 * occurs, it will occurs afterwards, and we got no sound.
                 * Reinitialization of the decoder is required.
                 */
                unsigned long i_rate;
                unsigned char i_channels;
371 372
                NeAACDecHandle *hfaad;
                NeAACDecConfiguration *cfg,*oldcfg;
373

374 375 376
                oldcfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
                hfaad = NeAACDecOpen();
                cfg = NeAACDecGetCurrentConfiguration( hfaad );
377 378 379 380
                if( oldcfg->defSampleRate )
                    cfg->defSampleRate = oldcfg->defSampleRate;
                cfg->defObjectType = oldcfg->defObjectType;
                cfg->outputFormat = oldcfg->outputFormat;
381
                NeAACDecSetConfiguration( hfaad, cfg );
382

383 384 385
                if( NeAACDecInit( hfaad,
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer,
386
                                  &i_rate,&i_channels ) < 0 )
387 388
                {
                    /* reinitialization failed */
389 390
                    NeAACDecClose( hfaad );
                    NeAACDecSetConfiguration( p_sys->hfaad, oldcfg );
391 392 393
                }
                else
                {
394
                    NeAACDecClose( p_sys->hfaad );
395 396 397 398 399 400 401 402 403 404
                    p_sys->hfaad = hfaad;
                    p_dec->fmt_out.audio.i_rate = i_rate;
                    p_dec->fmt_out.audio.i_channels = i_channels;
                    p_dec->fmt_out.audio.i_physical_channels
                        = p_dec->fmt_out.audio.i_original_channels
                        = pi_channels_guessed[i_channels];
                    date_Init( &p_sys->date, i_rate, 1 );
                }
            }

405
            Flush( p_dec );
406
            p_sys->b_discontinuity = true;
407

408
            return VLCDEC_SUCCESS;
409
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
410

Gildas Bazin's avatar
 
Gildas Bazin committed
411
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
412
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
413
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
414
            FlushBuffer( p_sys, frame.bytesconsumed );
415
            date_Set( &p_sys->date, VLC_TS_INVALID );
416
            p_sys->b_discontinuity = true;
417
            return VLCDEC_SUCCESS;
418
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
419

420 421
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
422
            msg_Warn( p_dec, "decoded zero sample" );
423
            FlushBuffer( p_sys, frame.bytesconsumed );
424
            return VLCDEC_SUCCESS;
425 426
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
427 428
        /* We decoded a valid frame */
        if( p_dec->fmt_out.audio.i_rate != frame.samplerate )
429
        {
430
            date_Init( &p_sys->date, frame.samplerate, 1 );
431
            date_Set( &p_sys->date, i_pts );
432 433
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
434 435
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
        p_dec->fmt_out.audio.i_channels = frame.channels;
436

437
        /* Adjust stream info when dealing with SBR/PS */
438 439
        bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2);
        if( p_sys->b_sbr != b_sbr || p_sys->b_ps != frame.ps )
440
        {
441 442
            const char *psz_ext = (b_sbr && frame.ps) ? "SBR+PS" :
                                    b_sbr ? "SBR" : "PS";
443

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

447 448 449 450 451
            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 );

452 453
            p_sys->b_sbr = b_sbr;
            p_sys->b_ps = frame.ps;
454
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
455 456

        /* Convert frame.channel_position to our own channel values */
457
        p_dec->fmt_out.audio.i_physical_channels = 0;
458
        const uint32_t nbChannels = frame.channels;
459 460
        unsigned j;
        for( unsigned i = 0; i < nbChannels; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
461 462 463 464 465 466 467
        {
            /* Find the channel code */
            for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ )
            {
                if( frame.channel_position[i] == pi_channels_in[j] )
                    break;
            }
468
            if( j >= MAX_CHANNEL_POSITIONS )
469
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
470
                msg_Warn( p_dec, "unknown channel ordering" );
471 472
                /* Invent something */
                j = i;
473
            }
474 475 476 477 478 479
            /* */
            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
480
        }
481 482 483 484 485 486 487 488 489 490 491 492
        if ( nbChannels != frame.channels )
        {
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[nbChannels];
        }
        else
        {
            p_dec->fmt_out.audio.i_original_channels =
                p_dec->fmt_out.audio.i_physical_channels;
        }
        p_dec->fmt_out.audio.i_channels = nbChannels;
493 494 495 496
        if( decoder_UpdateAudioFormat( p_dec ) )
            p_out = NULL;
        else
            p_out = decoder_NewAudioBuffer( p_dec, frame.samples / nbChannels );
Gildas Bazin's avatar
 
Gildas Bazin committed
497
        if( p_out == NULL )
498
        {
499
            FlushBuffer( p_sys, SIZE_MAX );
500
            return VLCDEC_SUCCESS;
501 502
        }

503
        p_out->i_pts = date_Get( &p_sys->date );
504
        p_out->i_length = date_Increment( &p_sys->date,
505
                                          frame.samples / nbChannels )
506
                          - p_out->i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
507

508
        DoReordering( (uint32_t *)p_out->p_buffer, samples,
509
                      frame.samples / nbChannels, nbChannels,
Gildas Bazin's avatar
 
Gildas Bazin committed
510
                      p_sys->pi_channel_positions );
511

512
        FlushBuffer( p_sys, frame.bytesconsumed );
513

514 515 516 517 518 519
        if( p_sys->b_discontinuity )
        {
            p_out->i_flags |= BLOCK_FLAG_DISCONTINUITY;
            p_sys->b_discontinuity = false;
        }

520 521
        decoder_QueueAudio( p_dec, p_out );
        return VLCDEC_SUCCESS;
522
    }
523 524 525
    else
    {
        /* Drop byte of padding */
526
        FlushBuffer( p_sys, 0 );
527
    }
528

529
    return VLCDEC_SUCCESS;
530 531 532
}

/*****************************************************************************
533
 * Close:
534
 *****************************************************************************/
535
static void Close( vlc_object_t *p_this )
536
{
Gildas Bazin's avatar
 
Gildas Bazin committed
537
    decoder_t *p_dec = (decoder_t *)p_this;
538 539
    decoder_sys_t *p_sys = p_dec->p_sys;

540
    NeAACDecClose( p_sys->hfaad );
541
    FlushBuffer( p_sys, SIZE_MAX );
542 543
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
544 545 546 547 548

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
549
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
550 551
                          int i_nb_channels, uint32_t *pi_chan_positions )
{
552
    int pi_chan_table[MAX_CHANNEL_POSITIONS] = {0};
Gildas Bazin's avatar
 
Gildas Bazin committed
553 554 555
    int i, j, k;

    /* Find the channels mapping */
556
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
557
    {
558
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
559 560 561 562 563 564 565 566 567 568
        {
            if( pi_channels_ordered[i] == pi_chan_positions[k] )
            {
                pi_chan_table[k] = j++;
                break;
            }
        }
    }

    /* Do the actual reordering */
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
569
    if( HAVE_FPU )
570 571 572 573 574 575 576 577 578
        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
579
}
580