faad.c 19.6 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 55 56 57 58 59
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 ()
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 );
Gildas Bazin's avatar
 
Gildas Bazin committed
132
    p_dec->fmt_out.i_cat = AUDIO_ES;
133

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

280 281 282 283 284 285
    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;

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

296
            date_Init( &p_sys->date, i_rate, 1 );
297 298 299
        }
    }

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

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

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

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

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

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

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

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

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

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

391
            Flush( p_dec );
392
            p_sys->b_discontinuity = true;
393

394
            return VLCDEC_SUCCESS;
395
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
396

397
        if( frame.channels == 0 || frame.channels >= 64 )
398
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
399
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
400
            FlushBuffer( p_sys, frame.bytesconsumed );
401 402 403 404 405
            if( frame.channels == 0 )
            {
                p_sys->b_discontinuity = true;
                return VLCDEC_SUCCESS;
            }
406
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
407

408
        if( frame.samples == 0 )
409
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
410
            msg_Warn( p_dec, "decoded zero sample" );
411
            FlushBuffer( p_sys, frame.bytesconsumed );
412
            return VLCDEC_SUCCESS;
413 414
        }

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

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

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

431 432 433
            msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
                    psz_ext, frame.channels, frame.samplerate );

434 435 436 437 438
            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 );

439 440
            p_sys->b_sbr = b_sbr;
            p_sys->b_ps = frame.ps;
441
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
442

443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459
        /* 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;
                }
            }
        }

460 461 462 463
        /* Hotfix channels misdetection/repetition for FDK 7.1 */
        const uint8_t fdk71config[] = { 1, 2, 3, 6, 7, 6, 7, 9 };
        if( frame.channels == 8 && !memcmp( frame.channel_position, fdk71config, 8 ) )
        {
464
            msg_Warn( p_dec, "Patching for FDK encoded 7.1 4 Front channel repeat bug" );
465 466 467 468
            frame.channel_position[3] = 4;
            frame.channel_position[4] = 5;
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
469
        /* Convert frame.channel_position to our own channel values */
470
        p_dec->fmt_out.audio.i_physical_channels = 0;
471 472 473
        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
474
        {
475 476
            unsigned pos = frame.channel_position[i];
            if( likely(pos < FAAD_CHANNEL_ID_COUNT) )
Gildas Bazin's avatar
 
Gildas Bazin committed
477
            {
478 479
                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
480
            }
481
            else pi_faad_channels_positions[i] = 0;
482
        }
483 484 485 486 487 488 489 490 491 492 493 494

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


        p_dec->fmt_out.audio.i_original_channels = p_dec->fmt_out.audio.i_physical_channels;
        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 )
495
        {
496 497 498 499 500
            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;

501 502 503 504
            /* 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 );

505 506 507 508 509 510 511 512 513 514 515 516
            /* 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 );
517
        }
518
        else
519
        {
520
            date_Increment( &p_sys->date, frame.samples / frame.channels );
521 522
        }

523
        FlushBuffer( p_sys, frame.bytesconsumed );
524

525
        return VLCDEC_SUCCESS;
526
    }
527 528 529
    else
    {
        /* Drop byte of padding */
530
        FlushBuffer( p_sys, 0 );
531
    }
532

533
    return VLCDEC_SUCCESS;
534 535 536
}

/*****************************************************************************
537
 * Close:
538
 *****************************************************************************/
539
static void Close( vlc_object_t *p_this )
540
{
Gildas Bazin's avatar
 
Gildas Bazin committed
541
    decoder_t *p_dec = (decoder_t *)p_this;
542 543
    decoder_sys_t *p_sys = p_dec->p_sys;

544
    NeAACDecClose( p_sys->hfaad );
545
    FlushBuffer( p_sys, SIZE_MAX );
546 547
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
548 549 550 551 552

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
553
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
554
                          int i_nb_channels, uint8_t *pi_chan_positions )
Gildas Bazin's avatar
 
Gildas Bazin committed
555
{
556 557 558 559 560 561 562
#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
563
    {
564
        for( int j = 0; j < i_nb_channels; j++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
565
        {
566 567
            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
568 569 570
        }
    }
}
571