faad.c 22.8 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
typedef struct
69 70
{
    /* 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
} decoder_sys_t;
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 132
    p_dec->fmt_out.audio.channel_type = p_dec->fmt_in.audio.channel_type;

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
        date_Set( &p_sys->date, VLC_TS_INVALID );
162 163
    }

164
    p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
165
    p_dec->fmt_out.audio.i_chan_mode = p_dec->fmt_in.audio.i_chan_mode;
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
    if( p_dec->fmt_out.audio.i_rate == 0 )
279
    {
280
        unsigned long i_rate = 0;
281 282
        unsigned char i_channels;

283 284 285 286
        /* 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 )
287
        {
288 289
            /* Failed, will try from data */
            i_rate = 0;
290 291
        }

292 293 294 295 296 297 298 299 300 301 302
        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 );
        }
303

304
        if( i_rate == 0 )
305
        {
306 307
            /* Can not init decoder at all for now */
            FlushBuffer( p_sys, SIZE_MAX );
308
            return VLCDEC_SUCCESS;
309
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
310

311
        /* Decoder Initialized */
Gildas Bazin's avatar
 
Gildas Bazin committed
312 313
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
314
        p_dec->fmt_out.audio.i_physical_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 ) == VLC_TS_INVALID )
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
    while( p_sys->p_block && p_sys->p_block->i_buffer > 0 )
332 333
    {
        void *samples;
334
        NeAACDecFrameInfo frame;
335
        block_t *p_out = NULL;
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
                    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
383
                        = mpeg4_asc_channelsbyindex[i_channels];
384 385 386 387
                    date_Init( &p_sys->date, i_rate, 1 );
                }
            }

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

391
            continue;
392
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
393

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

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

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

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

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

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

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

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

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
512
        /* Convert frame.channel_position to our own channel values */
513
        p_dec->fmt_out.audio.i_physical_channels = 0;
514

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

        bool b_reorder = false;
        if (p_dec->fmt_out.audio.channel_type == AUDIO_CHANNEL_TYPE_BITMAP)
Gildas Bazin's avatar
 
Gildas Bazin committed
520
        {
521
            for( size_t i = 0; i < frame.channels && i < FAAD_CHANNEL_ID_COUNT; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
522
            {
523 524 525 526 527 528 529
                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;
Gildas Bazin's avatar
 
Gildas Bazin committed
530
            }
531 532 533 534 535 536 537 538 539 540 541 542
        }
        else if (p_dec->fmt_out.audio.channel_type == AUDIO_CHANNEL_TYPE_AMBISONICS
            && frame.channels == 4)
        {
            pi_faad_channels_positions[0] = AOUT_CHAN_REARCENTER;
            pi_faad_channels_positions[1] = AOUT_CHAN_LEFT;
            pi_faad_channels_positions[2] = AOUT_CHAN_RIGHT;
            pi_faad_channels_positions[3] = AOUT_CHAN_CENTER;
            p_dec->fmt_out.audio.i_physical_channels =
                AOUT_CHAN_CENTER | AOUT_CHAN_LEFT
                | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER;
        }
543

544 545
        b_reorder = aout_CheckChannelReorder( pi_faad_channels_positions, NULL,
            p_dec->fmt_out.audio.i_physical_channels, pi_neworder_table );
546

547
        p_dec->fmt_out.audio.i_channels = vlc_popcount(p_dec->fmt_out.audio.i_physical_channels);
548 549 550 551 552

        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 )
553
        {
554 555 556 557 558
            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;

559 560 561
            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 */
562
                if( vlc_popcount(p_dec->fmt_out.audio.i_physical_channels) != frame.channels )
563 564
                    memset( p_out->p_buffer, 0, p_out->i_buffer );
            }
565

566
            /* FIXME: replace when aout_channel_reorder can take samples from a different buffer */
567 568 569 570
            if( b_reorder )
                DoReordering( (uint32_t *)p_out->p_buffer, samples,
                              frame.samples / frame.channels, frame.channels,
                              pi_neworder_table );
571 572
            else
                 memcpy( p_out->p_buffer, samples, p_out->i_buffer );
573 574 575 576 577 578 579 580

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

            decoder_QueueAudio( p_dec, p_out );
581
        }
582
        else
583
        {
584
            date_Increment( &p_sys->date, frame.samples / frame.channels );
585 586
        }

587
        FlushBuffer( p_sys, frame.bytesconsumed ? frame.bytesconsumed : SIZE_MAX );
588

589 590 591 592 593 594 595
        if( p_sys->p_block && p_sys->p_block->i_buffer == 1 )
        {
            /* Drop byte of padding */
            FlushBuffer( p_sys, 0 );
        }

        continue;
596
    }
597

598
    return VLCDEC_SUCCESS;
599 600 601
}

/*****************************************************************************
602
 * Close:
603
 *****************************************************************************/
604
static void Close( vlc_object_t *p_this )
605
{
Gildas Bazin's avatar
 
Gildas Bazin committed
606
    decoder_t *p_dec = (decoder_t *)p_this;
607 608
    decoder_sys_t *p_sys = p_dec->p_sys;

609
    NeAACDecClose( p_sys->hfaad );
610
    FlushBuffer( p_sys, SIZE_MAX );
611 612
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
613 614 615 616 617

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
618
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
619
                          int i_nb_channels, uint8_t *pi_chan_positions )
Gildas Bazin's avatar
 
Gildas Bazin committed
620
{
621 622 623 624 625 626 627
#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
628
    {
629
        for( int j = 0; j < i_nb_channels; j++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
630
        {
631 632
            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
633 634 635
        }
    }
}
636