faad.c 22.1 KB
Newer Older
1
/*****************************************************************************
Pere Orga's avatar
Pere Orga committed
2
 * faad.c: AAC decoder using libfaad2
3
 *****************************************************************************
Jean-Baptiste Kempf's avatar
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
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
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
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
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>
40
#include <vlc_codec.h>
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
41
#include <vlc_cpu.h>
42
#include <vlc_aout.h>
43

44
#include <neaacdec.h>
45
#include "../packetizer/mpeg4audio.h"
46 47 48 49 50

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

53 54
vlc_module_begin ()
    set_description( N_("AAC audio decoder (using libfaad2)") )
55
    set_capability( "audio decoder", 100 )
56 57 58 59
    set_category( CAT_INPUT )
    set_subcategory( SUBCAT_INPUT_ACODEC )
    set_callbacks( Open, Close )
vlc_module_end ()
60 61 62 63

/****************************************************************************
 * Local prototypes
 ****************************************************************************/
64
static int DecodeBlock( decoder_t *, block_t * );
65
static void Flush( decoder_t * );
66
static void DoReordering( uint32_t *, uint32_t *, int, int, uint8_t * );
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

79
    /* Channel positions of the current stream (for re-ordering) */
80
    uint32_t pi_channel_positions[MPEG4_ASC_MAX_INDEXEDPOS];
81

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

85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
#if MPEG4_ASC_MAX_INDEXEDPOS != LFE_CHANNEL
    #error MPEG4_ASC_MAX_INDEXEDPOS != LFE_CHANNEL
#endif

#define FAAD_CHANNEL_ID_COUNT (LFE_CHANNEL + 1)
static const uint32_t pi_tovlcmapping[FAAD_CHANNEL_ID_COUNT] =
{
    [UNKNOWN_CHANNEL]      = 0,
    [FRONT_CHANNEL_CENTER] = AOUT_CHAN_CENTER,
    [FRONT_CHANNEL_LEFT]   = AOUT_CHAN_LEFT,
    [FRONT_CHANNEL_RIGHT]  = AOUT_CHAN_RIGHT,
    [SIDE_CHANNEL_LEFT]    = AOUT_CHAN_MIDDLELEFT,
    [SIDE_CHANNEL_RIGHT]   = AOUT_CHAN_MIDDLERIGHT,
    [BACK_CHANNEL_LEFT]    = AOUT_CHAN_REARLEFT,
    [BACK_CHANNEL_RIGHT]   = AOUT_CHAN_REARRIGHT,
    [BACK_CHANNEL_CENTER]  = AOUT_CHAN_REARCENTER,
    [LFE_CHANNEL]          = AOUT_CHAN_LFE
};
103

104
/*****************************************************************************
105
 * OpenDecoder: probe the decoder and return score
106
 *****************************************************************************/
107
static int Open( vlc_object_t *p_this )
108
{
109
    decoder_t *p_dec = (decoder_t*)p_this;
110
    decoder_sys_t *p_sys;
111
    NeAACDecConfiguration *cfg;
112

113
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
114
    {
115 116 117 118
        return VLC_EGENERIC;
    }

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

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

130
    /* Misc init */
131
    date_Set( &p_sys->date, 0 );
132

133 134
    p_dec->fmt_out.audio.channel_type = p_dec->fmt_in.audio.channel_type;

135
    if( p_dec->fmt_in.i_extra > 0 )
136 137
    {
        /* We have a decoder config so init the handle */
138 139
        unsigned long i_rate;
        unsigned char i_channels;
140

141 142 143
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) < 0 )
144
        {
145
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
146
            NeAACDecClose( p_sys->hfaad );
147
            free( p_sys );
148 149 150
            return VLC_EGENERIC;
        }

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

165
    p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
166
    p_dec->fmt_out.audio.i_chan_mode = p_dec->fmt_in.audio.i_chan_mode;
167

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

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

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

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

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

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

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

224
/*****************************************************************************
225
 * DecodeBlock:
226
 *****************************************************************************/
227
static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
228 229 230
{
    decoder_sys_t *p_sys = p_dec->p_sys;

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

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

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

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

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

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

279
    if( p_dec->fmt_out.audio.i_rate == 0 )
280
    {
281
        unsigned long i_rate = 0;
282 283
        unsigned char i_channels;

284 285 286 287
        /* Init from DecoderConfig */
        if( p_dec->fmt_in.i_extra > 0 &&
            NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra, &i_rate, &i_channels ) != 0 )
288
        {
289 290
            /* Failed, will try from data */
            i_rate = 0;
291 292
        }

293 294 295 296 297 298 299 300 301 302 303
        if( i_rate == 0 && p_sys->p_block && p_sys->p_block->i_buffer )
        {
            /* Init faad with the first frame */
            long i_read = NeAACDecInit( p_sys->hfaad,
                                        p_sys->p_block->p_buffer, p_sys->p_block->i_buffer,
                                        &i_rate, &i_channels );
            if( i_read < 0 || (size_t) i_read > p_sys->p_block->i_buffer )
                i_rate = 0;
            else
                FlushBuffer( p_sys, i_read );
        }
304

305
        if( i_rate == 0 )
306
        {
307 308
            /* Can not init decoder at all for now */
            FlushBuffer( p_sys, SIZE_MAX );
309
            return VLCDEC_SUCCESS;
310
        }
311

312
        /* Decoder Initialized */
313 314
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
315
        p_dec->fmt_out.audio.i_physical_channels
316
            = mpeg4_asc_channelsbyindex[i_channels];
317
        date_Init( &p_sys->date, i_rate, 1 );
318 319
    }

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

    /* Decode all data */
332
    while( p_sys->p_block && p_sys->p_block->i_buffer > 0 )
333 334
    {
        void *samples;
335
        NeAACDecFrameInfo frame;
336
        block_t *p_out = NULL;
337

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

        if( frame.error > 0 )
        {
344
            msg_Warn( p_dec, "%s", NeAACDecGetErrorMessage( frame.error ) );
345

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

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

368 369 370
                if( NeAACDecInit( hfaad,
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer,
371
                                  &i_rate,&i_channels ) < 0 )
372 373
                {
                    /* reinitialization failed */
374 375
                    NeAACDecClose( hfaad );
                    NeAACDecSetConfiguration( p_sys->hfaad, oldcfg );
376 377 378
                }
                else
                {
379
                    NeAACDecClose( p_sys->hfaad );
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
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
            continue;
393
        }
394

395
        if( frame.channels == 0 || frame.channels >= 64 )
396
        {
397
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
398 399
            if( frame.channels == 0 )
                p_sys->b_discontinuity = true;
400 401
            FlushBuffer( p_sys, frame.bytesconsumed ? frame.bytesconsumed : SIZE_MAX );
            continue;
402
        }
403

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

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
        }

418
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
419

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

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

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

435 436
            p_sys->b_sbr = b_sbr;
            p_sys->b_ps = frame.ps;
437
        }
438

439
#ifndef FAAD2_VIDEOLAN_PATCHED
440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456
        /* PS Enabled FAAD PCA bug hotfix (contribs has patch) */
        if( frame.channels == 8 )
        {
            const uint8_t psbugconfig[3][8] = { { 2, 3, 2, 3, 2, 3, 6, 7 },  /* fdk 7.1 (4 Front) */
                                                { 2, 3, 2, 3, 2, 3, 4, 5 },  /* 7.1 */
                                                { 1, 2, 3, 4, 5, 6, 7, 9 } };/* fixed */
            for( size_t i=0; i<2; i++ )
            {
                if( !memcmp( frame.channel_position, psbugconfig[i], 8 ) )
                {
                    msg_Warn( p_dec, "Unpatched FAAD2 library with PS Bug. Trying to workaround !" );
                    memcpy( frame.channel_position, psbugconfig[2], 8 );
                    break;
                }
            }
        }

457
        /* Hotfix channels misdetection/repetition for FDK 7.1 */
458
        struct
459
        {
460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478
            const uint8_t chans;
            const uint8_t faulty[8];
            const uint8_t fixed[8];
        } const channel_repeat_fixes[] = {
            { 7, { 2, 3, 2, 3, 2, 3, 6 },    { 1, 2, 3, 6, 7, 8, 9 }    }, /* 3F 3R LFE #18273 */
            { 8, { 1, 2, 3, 6, 7, 6, 7, 9 }, { 1, 2, 3, 6, 7, 4, 5, 9 } }, /* FDK encoded 7.1 */
        };

        for( size_t i=0; i<ARRAY_SIZE(channel_repeat_fixes); i++ )
        {
            if( channel_repeat_fixes[i].chans == frame.channels &&
                !memcmp( frame.channel_position, channel_repeat_fixes[i].faulty,
                                                 channel_repeat_fixes[i].chans ) )
            {
                msg_Warn( p_dec, "Patching for Front channel repeat bug" );
                memcpy( frame.channel_position, channel_repeat_fixes[i].fixed,
                                                channel_repeat_fixes[i].chans );
                break;
            }
479
        }
480
#endif
481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511
        /* Handle > 1 local pair 5.1 setups.
           In case of more than 1 channel pair per area, faad will have repeats
           in channels sequence. We need to remap to available surround channels.
           Front > Middle > Rear:
           In case of 4 middle, it maps to 2F 2M if no previous front.
           In case of 4 rear, it maps to 2M 2R if no previous rear.
        */
        unsigned i_faadused = 0;
        for( unsigned i=0; i<frame.channels; i++ )
            if( frame.channel_position[i] > 0 )
                i_faadused |= 1 << frame.channel_position[i];

        for( size_t i=3; i<frame.channels; i++ )
        {
             if( frame.channel_position[i - 3] == frame.channel_position[i - 1] &&
                 frame.channel_position[i - 2] == frame.channel_position[i] &&
                 frame.channel_position[i - 1] >= SIDE_CHANNEL_LEFT &&
                 frame.channel_position[i - 1] <= BACK_CHANNEL_CENTER &&
                 frame.channel_position[i - 1] >= SIDE_CHANNEL_LEFT &&
                 frame.channel_position[i - 1] <= BACK_CHANNEL_CENTER )
             {
                if( ( (1 << (frame.channel_position[i - 3] - 2)) & i_faadused ) == 0 &&
                    ( (1 << (frame.channel_position[i - 2] - 2)) & i_faadused ) == 0 )
                {
                    frame.channel_position[i - 3] -= 2;
                    frame.channel_position[i - 2] -= 2;
                    i_faadused |= 1 << frame.channel_position[i - 3];
                    i_faadused |= 1 << frame.channel_position[i - 2];
                }
             }
        }
512

513
        /* Convert frame.channel_position to our own channel values */
514
        p_dec->fmt_out.audio.i_physical_channels = 0;
515

516
        uint8_t  pi_neworder_table[AOUT_CHAN_MAX];
517 518 519 520
        uint32_t pi_faad_channels_positions[FAAD_CHANNEL_ID_COUNT] = {0};

        bool b_reorder = false;
        if (p_dec->fmt_out.audio.channel_type == AUDIO_CHANNEL_TYPE_BITMAP)
521
        {
522
            for( size_t i = 0; i < frame.channels; i++ )
523
            {
524 525 526 527 528 529 530
                unsigned pos = frame.channel_position[i];
                if( likely(pos < FAAD_CHANNEL_ID_COUNT) )
                {
                    pi_faad_channels_positions[i] = pi_tovlcmapping[pos];
                    p_dec->fmt_out.audio.i_physical_channels |= pi_faad_channels_positions[i];
                }
                else pi_faad_channels_positions[i] = 0;
531
            }
532

533 534
            b_reorder = aout_CheckChannelReorder( pi_faad_channels_positions, NULL,
                p_dec->fmt_out.audio.i_physical_channels, pi_neworder_table );
535

536 537
            p_dec->fmt_out.audio.i_channels = popcount(p_dec->fmt_out.audio.i_physical_channels);
        }
538 539 540 541 542

        if( !decoder_UpdateAudioFormat( p_dec ) && p_dec->fmt_out.audio.i_channels > 0 )
            p_out = decoder_NewAudioBuffer( p_dec, frame.samples / p_dec->fmt_out.audio.i_channels );

        if( p_out )
543
        {
544 545 546 547 548
            p_out->i_pts = date_Get( &p_sys->date );
            p_out->i_length = date_Increment( &p_sys->date,
                                              frame.samples / frame.channels )
                              - p_out->i_pts;

549 550 551 552 553 554
            if ( p_dec->fmt_out.audio.channel_type == AUDIO_CHANNEL_TYPE_BITMAP )
            {
                /* Don't kill speakers if some weird mapping does not gets 1:1 */
                if( popcount(p_dec->fmt_out.audio.i_physical_channels) != frame.channels )
                    memset( p_out->p_buffer, 0, p_out->i_buffer );
            }
555

556
            /* FIXME: replace when aout_channel_reorder can take samples from a different buffer */
557 558 559 560
            if( b_reorder )
                DoReordering( (uint32_t *)p_out->p_buffer, samples,
                              frame.samples / frame.channels, frame.channels,
                              pi_neworder_table );
561 562
            else
                 memcpy( p_out->p_buffer, samples, p_out->i_buffer );
563 564 565 566 567 568 569 570

            if( p_sys->b_discontinuity )
            {
                p_out->i_flags |= BLOCK_FLAG_DISCONTINUITY;
                p_sys->b_discontinuity = false;
            }

            decoder_QueueAudio( p_dec, p_out );
571
        }
572
        else
573
        {
574
            date_Increment( &p_sys->date, frame.samples / frame.channels );
575 576
        }

577
        FlushBuffer( p_sys, frame.bytesconsumed ? frame.bytesconsumed : SIZE_MAX );
578

579 580 581 582 583 584 585
        if( p_sys->p_block && p_sys->p_block->i_buffer == 1 )
        {
            /* Drop byte of padding */
            FlushBuffer( p_sys, 0 );
        }

        continue;
586
    }
587

588
    return VLCDEC_SUCCESS;
589 590 591
}

/*****************************************************************************
592
 * Close:
593
 *****************************************************************************/
594
static void Close( vlc_object_t *p_this )
595
{
596
    decoder_t *p_dec = (decoder_t *)p_this;
597 598
    decoder_sys_t *p_sys = p_dec->p_sys;

599
    NeAACDecClose( p_sys->hfaad );
600
    FlushBuffer( p_sys, SIZE_MAX );
601 602
    free( p_sys );
}
603 604 605 606 607

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
608
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
609
                          int i_nb_channels, uint8_t *pi_chan_positions )
610
{
611 612 613 614 615 616 617
#if HAVE_FPU
    #define CAST_SAMPLE(a) a
#else
    #define CAST_SAMPLE(a) ((uint16_t *)a)
#endif
    /* Do the actual reordering */
    for( int i = 0; i < i_samples; i++ )
618
    {
619
        for( int j = 0; j < i_nb_channels; j++ )
620
        {
621 622
            CAST_SAMPLE(p_out)[i * i_nb_channels + pi_chan_positions[j]] =
                CAST_SAMPLE(p_in)[i * i_nb_channels + j];
623 624 625
        }
    }
}
626