faad.c 19.2 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
#include "../packetizer/mpeg4audio.h"
45 46 47 48 49

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

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

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

67 68 69
struct decoder_sys_t
{
    /* faad handler */
70
    NeAACDecHandle *hfaad;
71 72

    /* samples */
73
    date_t date;
74 75

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

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

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

84 85
/* Channels positions values as output by faad */
static const uint32_t pi_channels_in[MPEG4_ASC_MAX_INDEXEDPOS] =
Gildas Bazin's avatar
 
Gildas Bazin committed
86 87 88 89
    { 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 };
90
static const uint32_t pi_channels_out[MPEG4_ASC_MAX_INDEXEDPOS] =
Gildas Bazin's avatar
 
Gildas Bazin committed
91 92 93 94
    { 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 };
95
static const uint32_t pi_channels_ordered[MPEG4_ASC_MAX_INDEXEDPOS] =
Gildas Bazin's avatar
 
Gildas Bazin committed
96 97 98 99 100 101
    { 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
    };

102
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
103
 * OpenDecoder: probe the decoder and return score
104
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
105
static int Open( vlc_object_t *p_this )
106
{
Gildas Bazin's avatar
 
Gildas Bazin committed
107
    decoder_t *p_dec = (decoder_t*)p_this;
Rémi Duraffort's avatar
Rémi Duraffort committed
108
    decoder_sys_t *p_sys;
109
    NeAACDecConfiguration *cfg;
110

111
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
112
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
113 114 115 116
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
117
    if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
118
        return VLC_ENOMEM;
119 120

    /* Open a faad context */
121
    if( ( p_sys->hfaad = NeAACDecOpen() ) == NULL )
122
    {
Benjamin Pracht's avatar
Benjamin Pracht committed
123
        msg_Err( p_dec, "cannot initialize faad" );
Rémi Duraffort's avatar
Rémi Duraffort committed
124
        free( p_sys );
125 126 127
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
128
    /* Misc init */
129
    date_Set( &p_sys->date, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
130
    p_dec->fmt_out.i_cat = AUDIO_ES;
131

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

Gildas Bazin's avatar
 
Gildas Bazin committed
134 135 136
    p_dec->fmt_out.audio.i_physical_channels =
        p_dec->fmt_out.audio.i_original_channels = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
137
    if( p_dec->fmt_in.i_extra > 0 )
138 139
    {
        /* We have a decoder config so init the handle */
Gildas Bazin's avatar
 
Gildas Bazin committed
140 141
        unsigned long i_rate;
        unsigned char i_channels;
142

143 144 145
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) < 0 )
146
        {
147
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
148
            NeAACDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
149
            free( p_sys );
150 151 152
            return VLC_EGENERIC;
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
153 154
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
155 156
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
157
            = mpeg4_asc_channelsbyindex[i_channels];
158
        date_Init( &p_sys->date, i_rate, 1 );
159 160 161 162
    }
    else
    {
        /* Will be initalised from first frame */
Gildas Bazin's avatar
 
Gildas Bazin committed
163
        p_dec->fmt_out.audio.i_rate = 0;
164
        p_dec->fmt_out.audio.i_channels = 0;
165 166
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
167
    /* Set the faad config */
168
    cfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
169 170
    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
171
    cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT;
172
    NeAACDecSetConfiguration( p_sys->hfaad, cfg );
173 174

    /* buffer */
175
    p_sys->p_block = NULL;
176

177
    p_sys->b_discontinuity =
178
    p_sys->b_sbr = p_sys->b_ps = false;
179

180 181
    p_dec->pf_decode = DecodeBlock;
    p_dec->pf_flush  = Flush;
182 183 184
    return VLC_SUCCESS;
}

185 186 187 188 189
/*****************************************************************************
 * FlushBuffer:
 *****************************************************************************/
static void FlushBuffer( decoder_sys_t *p_sys, size_t i_used )
{
190 191
    block_t *p_block = p_sys->p_block;
    if( p_block )
192
    {
193 194 195
        if( i_used < p_block->i_buffer )
        {
            /* Drop padding */
196 197 198
            for( ; i_used < p_block->i_buffer; i_used++ )
                if( p_block->p_buffer[i_used] != 0x00 )
                    break;
199

200 201 202 203 204
            p_block->i_buffer -= i_used;
            p_block->p_buffer += i_used;
        }
        else p_block->i_buffer = 0;
        if( p_block->i_buffer == 0 )
205
        {
206 207
            block_Release( p_block );
            p_sys->p_block = NULL;
208 209 210 211
        }
    }
}

212 213 214 215 216 217 218 219 220 221 222
/*****************************************************************************
 * 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 );
}

223
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
224
 * DecodeBlock:
225
 *****************************************************************************/
226
static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
227 228 229
{
    decoder_sys_t *p_sys = p_dec->p_sys;

230 231
    if( !p_block ) /* No Drain */
        return VLCDEC_SUCCESS;
232

233
    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY | BLOCK_FLAG_CORRUPTED) )
234
    {
235
        Flush( p_dec );
236 237 238
        if( p_block->i_flags & (BLOCK_FLAG_CORRUPTED) )
        {
            block_Release( p_block );
239
            return VLCDEC_SUCCESS;
240
        }
241 242
    }

243 244 245 246 247 248 249 250 251 252 253
    /* 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 )
            {
254
                p_block->p_buffer += i_header_size;
255 256 257 258 259
                p_block->i_buffer -= i_header_size;
            }
        }
    }

260 261 262 263
    const mtime_t i_pts = p_block->i_pts;

    /* Append block as temporary buffer */
    if( p_sys->p_block == NULL )
264
    {
265
        p_sys->p_block = p_block;
266
    }
267
    else
Gildas Bazin's avatar
 
Gildas Bazin committed
268
    {
269 270 271 272 273
        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
274 275
    }

276 277
    /* !Warn: do not use p_block beyond this point */

278 279 280 281 282 283
    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;

284 285 286
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) >= 0 )
287 288 289
        {
            p_dec->fmt_out.audio.i_rate = i_rate;
            p_dec->fmt_out.audio.i_channels = i_channels;
290 291
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
292
                = mpeg4_asc_channelsbyindex[i_channels];
293

294
            date_Init( &p_sys->date, i_rate, 1 );
295 296 297
        }
    }

298
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->p_block && p_sys->p_block->i_buffer )
299
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
300 301
        unsigned long i_rate;
        unsigned char i_channels;
302 303

        /* Init faad with the first frame */
304
        if( NeAACDecInit( p_sys->hfaad,
305
                          p_sys->p_block->p_buffer, p_sys->p_block->i_buffer,
306
                          &i_rate, &i_channels ) < 0 )
307
        {
308
            return VLCDEC_SUCCESS;
309
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
310 311 312

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
313 314
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
315
            = mpeg4_asc_channelsbyindex[i_channels];
316
        date_Init( &p_sys->date, i_rate, 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
317 318
    }

319
    if( i_pts > VLC_TS_INVALID && i_pts != date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
320
    {
321
        date_Set( &p_sys->date, i_pts );
Gildas Bazin's avatar
 
Gildas Bazin committed
322
    }
323
    else if( !date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
324 325
    {
        /* We've just started the stream, wait for the first PTS. */
326
        FlushBuffer( p_sys, SIZE_MAX );
327
        return VLCDEC_SUCCESS;
328 329 330
    }

    /* Decode all data */
331
    if( p_sys->p_block && p_sys->p_block->i_buffer > 1 )
332 333
    {
        void *samples;
334
        NeAACDecFrameInfo frame;
335
        block_t *p_out;
336

337
        samples = NeAACDecDecode( p_sys->hfaad, &frame,
338 339
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer );
340 341 342

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

345
            if( frame.error == 21 || frame.error == 12 )
346 347
            {
                /*
348 349
                 * Once an "Unexpected channel configuration change"
                 * or a "Invalid number of channels" error
350 351 352 353 354
                 * occurs, it will occurs afterwards, and we got no sound.
                 * Reinitialization of the decoder is required.
                 */
                unsigned long i_rate;
                unsigned char i_channels;
355 356
                NeAACDecHandle *hfaad;
                NeAACDecConfiguration *cfg,*oldcfg;
357

358 359 360
                oldcfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
                hfaad = NeAACDecOpen();
                cfg = NeAACDecGetCurrentConfiguration( hfaad );
361 362 363 364
                if( oldcfg->defSampleRate )
                    cfg->defSampleRate = oldcfg->defSampleRate;
                cfg->defObjectType = oldcfg->defObjectType;
                cfg->outputFormat = oldcfg->outputFormat;
365
                NeAACDecSetConfiguration( hfaad, cfg );
366

367 368 369
                if( NeAACDecInit( hfaad,
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer,
370
                                  &i_rate,&i_channels ) < 0 )
371 372
                {
                    /* reinitialization failed */
373 374
                    NeAACDecClose( hfaad );
                    NeAACDecSetConfiguration( p_sys->hfaad, oldcfg );
375 376 377
                }
                else
                {
378
                    NeAACDecClose( p_sys->hfaad );
379 380 381 382 383
                    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
384
                        = mpeg4_asc_channelsbyindex[i_channels];
385 386 387 388
                    date_Init( &p_sys->date, i_rate, 1 );
                }
            }

389
            Flush( p_dec );
390
            p_sys->b_discontinuity = true;
391

392
            return VLCDEC_SUCCESS;
393
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
394

Gildas Bazin's avatar
 
Gildas Bazin committed
395
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
396
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
397
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
398
            FlushBuffer( p_sys, frame.bytesconsumed );
399
            date_Set( &p_sys->date, VLC_TS_INVALID );
400
            p_sys->b_discontinuity = true;
401
            return VLCDEC_SUCCESS;
402
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
403

404 405
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
406
            msg_Warn( p_dec, "decoded zero sample" );
407
            FlushBuffer( p_sys, frame.bytesconsumed );
408
            return VLCDEC_SUCCESS;
409 410
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
411 412
        /* We decoded a valid frame */
        if( p_dec->fmt_out.audio.i_rate != frame.samplerate )
413
        {
414
            date_Init( &p_sys->date, frame.samplerate, 1 );
415
            date_Set( &p_sys->date, i_pts );
416 417
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
418 419
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
        p_dec->fmt_out.audio.i_channels = frame.channels;
420

421
        /* Adjust stream info when dealing with SBR/PS */
422 423
        bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2);
        if( p_sys->b_sbr != b_sbr || p_sys->b_ps != frame.ps )
424
        {
425 426
            const char *psz_ext = (b_sbr && frame.ps) ? "SBR+PS" :
                                    b_sbr ? "SBR" : "PS";
427

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

431 432 433 434 435
            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 );

436 437
            p_sys->b_sbr = b_sbr;
            p_sys->b_ps = frame.ps;
438
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
439 440

        /* Convert frame.channel_position to our own channel values */
441
        p_dec->fmt_out.audio.i_physical_channels = 0;
442
        const uint32_t nbChannels = frame.channels;
443 444
        unsigned j;
        for( unsigned i = 0; i < nbChannels; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
445 446
        {
            /* Find the channel code */
447
            for( j = 0; j < MPEG4_ASC_MAX_INDEXEDPOS; j++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
448 449 450 451
            {
                if( frame.channel_position[i] == pi_channels_in[j] )
                    break;
            }
452
            if( j >= MPEG4_ASC_MAX_INDEXEDPOS )
453
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
454
                msg_Warn( p_dec, "unknown channel ordering" );
455 456
                /* Invent something */
                j = i;
457
            }
458 459 460 461 462 463
            /* */
            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
464
        }
465 466 467 468
        if ( nbChannels != frame.channels )
        {
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
469
                = mpeg4_asc_channelsbyindex[nbChannels];
470 471 472 473 474 475 476
        }
        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;
477 478 479 480
        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
481
        if( p_out == NULL )
482
        {
483
            FlushBuffer( p_sys, SIZE_MAX );
484
            return VLCDEC_SUCCESS;
485 486
        }

487
        p_out->i_pts = date_Get( &p_sys->date );
488
        p_out->i_length = date_Increment( &p_sys->date,
489
                                          frame.samples / nbChannels )
490
                          - p_out->i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
491

492
        DoReordering( (uint32_t *)p_out->p_buffer, samples,
493
                      frame.samples / nbChannels, nbChannels,
Gildas Bazin's avatar
 
Gildas Bazin committed
494
                      p_sys->pi_channel_positions );
495

496
        FlushBuffer( p_sys, frame.bytesconsumed );
497

498 499 500 501 502 503
        if( p_sys->b_discontinuity )
        {
            p_out->i_flags |= BLOCK_FLAG_DISCONTINUITY;
            p_sys->b_discontinuity = false;
        }

504 505
        decoder_QueueAudio( p_dec, p_out );
        return VLCDEC_SUCCESS;
506
    }
507 508 509
    else
    {
        /* Drop byte of padding */
510
        FlushBuffer( p_sys, 0 );
511
    }
512

513
    return VLCDEC_SUCCESS;
514 515 516
}

/*****************************************************************************
517
 * Close:
518
 *****************************************************************************/
519
static void Close( vlc_object_t *p_this )
520
{
Gildas Bazin's avatar
 
Gildas Bazin committed
521
    decoder_t *p_dec = (decoder_t *)p_this;
522 523
    decoder_sys_t *p_sys = p_dec->p_sys;

524
    NeAACDecClose( p_sys->hfaad );
525
    FlushBuffer( p_sys, SIZE_MAX );
526 527
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
528 529 530 531 532

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
533
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
534 535
                          int i_nb_channels, uint32_t *pi_chan_positions )
{
536
    int pi_chan_table[MPEG4_ASC_MAX_INDEXEDPOS] = {0};
Gildas Bazin's avatar
 
Gildas Bazin committed
537 538 539
    int i, j, k;

    /* Find the channels mapping */
540
    for( i = 0, j = 0; i < MPEG4_ASC_MAX_INDEXEDPOS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
541
    {
542
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
543 544 545 546 547 548 549 550 551 552
        {
            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
553
    if( HAVE_FPU )
554 555 556 557 558 559 560 561 562
        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
563
}
564