faad.c 20 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
#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 * );
Gildas Bazin's avatar
 
Gildas Bazin committed
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
    /* 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
};
Gildas Bazin's avatar
 
Gildas Bazin committed
103

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

113
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
114
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
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" );
Rémi Duraffort's avatar
Rémi Duraffort committed
126
        free( p_sys );
127 128 129
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
130
    /* Misc init */
131
    date_Set( &p_sys->date, 0 );
132

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

292
            date_Init( &p_sys->date, i_rate, 1 );
293 294 295
        }
    }

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

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

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

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

    /* Decode all data */
328
    if( p_sys->p_block && p_sys->p_block->i_buffer > 1 )
329 330
    {
        void *samples;
331
        NeAACDecFrameInfo frame;
332
        block_t *p_out = NULL;
333

334
        samples = NeAACDecDecode( p_sys->hfaad, &frame,
335 336
                                  p_sys->p_block->p_buffer,
                                  p_sys->p_block->i_buffer );
337 338 339

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

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

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

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

385
            Flush( p_dec );
386
            p_sys->b_discontinuity = true;
387

388
            return VLCDEC_SUCCESS;
389
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
390

391
        if( frame.channels == 0 || frame.channels >= 64 )
392
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
393
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
394
            FlushBuffer( p_sys, frame.bytesconsumed );
395 396 397 398 399
            if( frame.channels == 0 )
            {
                p_sys->b_discontinuity = true;
                return VLCDEC_SUCCESS;
            }
400
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
401

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
416
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
417

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

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

428 429 430 431 432
            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 );

433 434
            p_sys->b_sbr = b_sbr;
            p_sys->b_ps = frame.ps;
435
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
436

437
#ifndef FAAD2_VIDEOLAN_PATCHED
438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
        /* 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;
                }
            }
        }

455
        /* Hotfix channels misdetection/repetition for FDK 7.1 */
456
        struct
457
        {
458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476
            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;
            }
477
        }
478
#endif
479

Gildas Bazin's avatar
 
Gildas Bazin committed
480
        /* Convert frame.channel_position to our own channel values */
481
        p_dec->fmt_out.audio.i_physical_channels = 0;
482 483 484
        uint32_t pi_faad_channels_positions[FAAD_CHANNEL_ID_COUNT] = {0};
        uint8_t  pi_neworder_table[AOUT_CHAN_MAX];
        for( size_t i = 0; i < frame.channels; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
485
        {
486 487
            unsigned pos = frame.channel_position[i];
            if( likely(pos < FAAD_CHANNEL_ID_COUNT) )
Gildas Bazin's avatar
 
Gildas Bazin committed
488
            {
489 490
                pi_faad_channels_positions[i] = pi_tovlcmapping[pos];
                p_dec->fmt_out.audio.i_physical_channels |= pi_faad_channels_positions[i];
Gildas Bazin's avatar
 
Gildas Bazin committed
491
            }
492
            else pi_faad_channels_positions[i] = 0;
493
        }
494 495 496 497 498 499 500 501 502 503 504

        aout_CheckChannelReorder( pi_faad_channels_positions, NULL,
                                  p_dec->fmt_out.audio.i_physical_channels, pi_neworder_table );


        p_dec->fmt_out.audio.i_channels = popcount(p_dec->fmt_out.audio.i_physical_channels);

        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 )
505
        {
506 507 508 509 510
            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;

511 512 513 514
            /* 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 );

515 516 517 518 519 520 521 522 523 524 525 526
            /* FIXME: replace when aout_channel_reorder can take samples from a different buffer */
            DoReordering( (uint32_t *)p_out->p_buffer, samples,
                          frame.samples / frame.channels, frame.channels,
                          pi_neworder_table );

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

            decoder_QueueAudio( p_dec, p_out );
527
        }
528
        else
529
        {
530
            date_Increment( &p_sys->date, frame.samples / frame.channels );
531 532
        }

533
        FlushBuffer( p_sys, frame.bytesconsumed );
534

535
        return VLCDEC_SUCCESS;
536
    }
537 538 539
    else
    {
        /* Drop byte of padding */
540
        FlushBuffer( p_sys, 0 );
541
    }
542

543
    return VLCDEC_SUCCESS;
544 545 546
}

/*****************************************************************************
547
 * Close:
548
 *****************************************************************************/
549
static void Close( vlc_object_t *p_this )
550
{
Gildas Bazin's avatar
 
Gildas Bazin committed
551
    decoder_t *p_dec = (decoder_t *)p_this;
552 553
    decoder_sys_t *p_sys = p_dec->p_sys;

554
    NeAACDecClose( p_sys->hfaad );
555
    FlushBuffer( p_sys, SIZE_MAX );
556 557
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
558 559 560 561 562

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
563
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
564
                          int i_nb_channels, uint8_t *pi_chan_positions )
Gildas Bazin's avatar
 
Gildas Bazin committed
565
{
566 567 568 569 570 571 572
#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++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
573
    {
574
        for( int j = 0; j < i_nb_channels; j++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
575
        {
576 577
            CAST_SAMPLE(p_out)[i * i_nb_channels + pi_chan_positions[j]] =
                CAST_SAMPLE(p_in)[i * i_nb_channels + j];
Gildas Bazin's avatar
 
Gildas Bazin committed
578 579 580
        }
    }
}
581