faad.c 19.4 KB
Newer Older
1
/*****************************************************************************
Pere Orga's avatar
Pere Orga committed
2
 * faad.c: AAC decoder using libfaad2
3
 *****************************************************************************
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
4
 * Copyright (C) 2001, 2003 VLC authors and VideoLAN
5
 * $Id$
6 7
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
 *          Gildas Bazin <gbazin@videolan.org>
9
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
10 11 12
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation; either version 2.1 of the License, or
13 14 15 16
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
17 18
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU Lesser General Public License for more details.
19
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
20 21 22
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23 24
 *****************************************************************************/

Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
25 26 27 28 29 30 31 32
/*****************************************************************************
 * NOTA BENE: this module requires the linking against a library which is
 * known to require licensing under the GNU General Public License version 2
 * (or later). Therefore, the result of compiling this module will normally
 * be subject to the terms of that later license.
 *****************************************************************************/


33 34 35 36
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

37
#include <vlc_common.h>
38
#include <vlc_plugin.h>
39
#include <vlc_input.h>
Clément Stenac's avatar
Clément Stenac committed
40
#include <vlc_codec.h>
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
41
#include <vlc_cpu.h>
42

43
#include <neaacdec.h>
44 45 46 47 48

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

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

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

#define MAX_CHANNEL_POSITIONS 9
66 67 68 69

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

    /* samples */
73
    date_t date;
74 75

    /* temporary buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
76 77
    uint8_t *p_buffer;
    int     i_buffer;
78
    size_t  i_buffer_size;
79

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

83
    bool b_sbr, b_ps;
84 85
};

Gildas Bazin's avatar
 
Gildas Bazin committed
86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] =
    { FRONT_CHANNEL_CENTER, FRONT_CHANNEL_LEFT, FRONT_CHANNEL_RIGHT,
      SIDE_CHANNEL_LEFT, SIDE_CHANNEL_RIGHT,
      BACK_CHANNEL_LEFT, BACK_CHANNEL_RIGHT,
      BACK_CHANNEL_CENTER, LFE_CHANNEL };
static const uint32_t pi_channels_out[MAX_CHANNEL_POSITIONS] =
    { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE };
static const uint32_t pi_channels_ordered[MAX_CHANNEL_POSITIONS] =
    { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
      AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
      AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_CENTER, AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE
    };
102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
static const uint32_t pi_channels_guessed[MAX_CHANNEL_POSITIONS] =
    { 0, AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
          | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_LFE,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT
          | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
          | AOUT_CHAN_CENTER,
      AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT
          | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
          | AOUT_CHAN_CENTER | AOUT_CHAN_LFE
    };
Gildas Bazin's avatar
 
Gildas Bazin committed
118

119
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
120
 * OpenDecoder: probe the decoder and return score
121
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
122
static int Open( vlc_object_t *p_this )
123
{
Gildas Bazin's avatar
 
Gildas Bazin committed
124
    decoder_t *p_dec = (decoder_t*)p_this;
Rémi Duraffort's avatar
Rémi Duraffort committed
125
    decoder_sys_t *p_sys;
126
    NeAACDecConfiguration *cfg;
127

128
    if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A )
129
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
130 131 132 133
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
134
    if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL )
135
        return VLC_ENOMEM;
136 137

    /* Open a faad context */
138
    if( ( p_sys->hfaad = NeAACDecOpen() ) == NULL )
139
    {
Benjamin Pracht's avatar
Benjamin Pracht committed
140
        msg_Err( p_dec, "cannot initialize faad" );
Rémi Duraffort's avatar
Rémi Duraffort committed
141
        free( p_sys );
142 143 144
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
145
    /* Misc init */
146
    date_Set( &p_sys->date, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
147
    p_dec->fmt_out.i_cat = AUDIO_ES;
148

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

Gildas Bazin's avatar
 
Gildas Bazin committed
151 152 153
    p_dec->fmt_out.audio.i_physical_channels =
        p_dec->fmt_out.audio.i_original_channels = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
154
    if( p_dec->fmt_in.i_extra > 0 )
155 156
    {
        /* We have a decoder config so init the handle */
Gildas Bazin's avatar
 
Gildas Bazin committed
157 158
        unsigned long i_rate;
        unsigned char i_channels;
159

160 161 162
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) < 0 )
163
        {
164
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
165
            NeAACDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
166
            free( p_sys );
167 168 169
            return VLC_EGENERIC;
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
170 171
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
172 173 174
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
175
        date_Init( &p_sys->date, i_rate, 1 );
176 177 178 179
    }
    else
    {
        /* Will be initalised from first frame */
Gildas Bazin's avatar
 
Gildas Bazin committed
180
        p_dec->fmt_out.audio.i_rate = 0;
181
        p_dec->fmt_out.audio.i_channels = 0;
182 183
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
184
    /* Set the faad config */
185
    cfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
186 187
    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
188
    cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT;
189
    NeAACDecSetConfiguration( p_sys->hfaad, cfg );
190 191

    /* buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
192
    p_sys->i_buffer = p_sys->i_buffer_size = 0;
193
    p_sys->p_buffer = NULL;
194

195
    /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
196
    p_dec->b_need_packetized = true;
197

198
    p_sys->b_sbr = p_sys->b_ps = false;
199 200

    p_dec->pf_decode_audio = DecodeBlock;
201 202 203 204
    return VLC_SUCCESS;
}

/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
205
 * DecodeBlock:
206
 *****************************************************************************/
207
static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
208 209
{
    decoder_sys_t *p_sys = p_dec->p_sys;
210
    block_t *p_block;
211

212 213 214
    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
215

Laurent Aimar's avatar
Laurent Aimar committed
216
    if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
217 218 219 220 221
    {
        block_Release( p_block );
        return NULL;
    }

222 223 224 225 226 227 228 229 230 231 232
    /* 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 )
            {
233
                p_block->p_buffer += i_header_size;
234 235 236 237 238
                p_block->i_buffer -= i_header_size;
            }
        }
    }

239 240 241
    /* Append the block to the temporary buffer */
    if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer )
    {
242 243 244 245 246 247 248 249 250 251 252
        size_t  i_buffer_size = p_sys->i_buffer + p_block->i_buffer;
        uint8_t *p_buffer     = realloc( p_sys->p_buffer, i_buffer_size );
        if( p_buffer )
        {
            p_sys->i_buffer_size = i_buffer_size;
            p_sys->p_buffer      = p_buffer;
        }
        else
        {
            p_block->i_buffer = 0;
        }
253 254
    }

255
    if( p_block->i_buffer > 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
256
    {
Rafaël Carré's avatar
Rafaël Carré committed
257
        memcpy( &p_sys->p_buffer[p_sys->i_buffer],
258
                     p_block->p_buffer, p_block->i_buffer );
Gildas Bazin's avatar
 
Gildas Bazin committed
259 260 261 262
        p_sys->i_buffer += p_block->i_buffer;
        p_block->i_buffer = 0;
    }

263 264 265 266 267 268
    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;

269 270 271
        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                           p_dec->fmt_in.i_extra,
                           &i_rate, &i_channels ) >= 0 )
272 273 274
        {
            p_dec->fmt_out.audio.i_rate = i_rate;
            p_dec->fmt_out.audio.i_channels = i_channels;
275 276 277 278
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[i_channels];

279
            date_Init( &p_sys->date, i_rate, 1 );
280 281 282
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
283
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
284
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
285 286
        unsigned long i_rate;
        unsigned char i_channels;
287 288

        /* Init faad with the first frame */
289 290 291
        if( NeAACDecInit( p_sys->hfaad,
                          p_sys->p_buffer, p_sys->i_buffer,
                          &i_rate, &i_channels ) < 0 )
292
        {
293
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
294
            return NULL;
295
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
296 297 298

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
299 300 301
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
302
        date_Init( &p_sys->date, i_rate, 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
303 304
    }

305
    if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
306
    {
307
        date_Set( &p_sys->date, p_block->i_pts );
Gildas Bazin's avatar
 
Gildas Bazin committed
308
    }
309
    else if( !date_Get( &p_sys->date ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
310 311 312 313 314
    {
        /* We've just started the stream, wait for the first PTS. */
        block_Release( p_block );
        p_sys->i_buffer = 0;
        return NULL;
315 316 317
    }

    /* Decode all data */
318
    if( p_sys->i_buffer > 1)
319 320
    {
        void *samples;
321
        NeAACDecFrameInfo frame;
322
        block_t *p_out;
323

324 325
        samples = NeAACDecDecode( p_sys->hfaad, &frame,
                                  p_sys->p_buffer, p_sys->i_buffer );
326 327 328

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

331
            if( frame.error == 21 || frame.error == 12 )
332 333
            {
                /*
334 335
                 * Once an "Unexpected channel configuration change"
                 * or a "Invalid number of channels" error
336 337 338 339 340
                 * occurs, it will occurs afterwards, and we got no sound.
                 * Reinitialization of the decoder is required.
                 */
                unsigned long i_rate;
                unsigned char i_channels;
341 342
                NeAACDecHandle *hfaad;
                NeAACDecConfiguration *cfg,*oldcfg;
343

344 345 346
                oldcfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
                hfaad = NeAACDecOpen();
                cfg = NeAACDecGetCurrentConfiguration( hfaad );
347 348 349 350
                if( oldcfg->defSampleRate )
                    cfg->defSampleRate = oldcfg->defSampleRate;
                cfg->defObjectType = oldcfg->defObjectType;
                cfg->outputFormat = oldcfg->outputFormat;
351
                NeAACDecSetConfiguration( hfaad, cfg );
352

353 354
                if( NeAACDecInit( hfaad, p_sys->p_buffer, p_sys->i_buffer,
                                  &i_rate,&i_channels ) < 0 )
355 356
                {
                    /* reinitialization failed */
357 358
                    NeAACDecClose( hfaad );
                    NeAACDecSetConfiguration( p_sys->hfaad, oldcfg );
359 360 361
                }
                else
                {
362
                    NeAACDecClose( p_sys->hfaad );
363 364 365 366 367 368 369 370 371 372
                    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
                        = pi_channels_guessed[i_channels];
                    date_Init( &p_sys->date, i_rate, 1 );
                }
            }

Gildas Bazin's avatar
 
Gildas Bazin committed
373
            /* Flush the buffer */
374
            p_sys->i_buffer = 0;
375
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
376
            return NULL;
377
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
378

Gildas Bazin's avatar
 
Gildas Bazin committed
379
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
380
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
381
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
Gildas Bazin's avatar
 
Gildas Bazin committed
382 383

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
384 385 386 387 388 389
            p_sys->i_buffer -= frame.bytesconsumed;
            if( p_sys->i_buffer > 0 )
            {
                memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed],
                         p_sys->i_buffer );
            }
390
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
391
            return NULL;
392
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
393

394 395
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
396
            msg_Warn( p_dec, "decoded zero sample" );
Gildas Bazin's avatar
 
Gildas Bazin committed
397 398

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
399
            p_sys->i_buffer -= frame.bytesconsumed;
400
            if( p_sys->i_buffer > 1 )
Gildas Bazin's avatar
 
Gildas Bazin committed
401 402 403 404
            {
                memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed],
                         p_sys->i_buffer );
            }
405 406 407 408 409
            else
            {
                /* Drop byte of padding */
                p_sys->i_buffer = 0;
            }
410
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
411
            return NULL;
412 413
        }

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

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

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

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

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

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

        /* Convert frame.channel_position to our own channel values */
445
        p_dec->fmt_out.audio.i_physical_channels = 0;
446
        const uint32_t nbChannels = frame.channels;
447 448
        unsigned j;
        for( unsigned i = 0; i < nbChannels; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
449 450 451 452 453 454 455
        {
            /* Find the channel code */
            for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ )
            {
                if( frame.channel_position[i] == pi_channels_in[j] )
                    break;
            }
456
            if( j >= MAX_CHANNEL_POSITIONS )
457
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
458
                msg_Warn( p_dec, "unknown channel ordering" );
459 460
                /* Invent something */
                j = i;
461
            }
462 463 464 465 466 467
            /* */
            p_sys->pi_channel_positions[i] = pi_channels_out[j];
            if( p_dec->fmt_out.audio.i_physical_channels & pi_channels_out[j] )
                frame.channels--; /* We loose a duplicated channel */
            else
                p_dec->fmt_out.audio.i_physical_channels |= pi_channels_out[j];
Gildas Bazin's avatar
 
Gildas Bazin committed
468
        }
469 470 471 472 473 474 475 476 477 478 479 480 481
        if ( nbChannels != frame.channels )
        {
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[nbChannels];
        }
        else
        {
            p_dec->fmt_out.audio.i_original_channels =
                p_dec->fmt_out.audio.i_physical_channels;
        }
        p_dec->fmt_out.audio.i_channels = nbChannels;
        p_out = decoder_NewAudioBuffer( p_dec, frame.samples / nbChannels );
Gildas Bazin's avatar
 
Gildas Bazin committed
482
        if( p_out == NULL )
483
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
484
            p_sys->i_buffer = 0;
485
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
486
            return NULL;
487 488
        }

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
498 499
        p_sys->i_buffer -= frame.bytesconsumed;
        if( p_sys->i_buffer > 0 )
500
        {
501 502
            memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
                     p_sys->i_buffer );
503 504
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
505
        return p_out;
506
    }
507 508 509 510 511
    else
    {
        /* Drop byte of padding */
        p_sys->i_buffer = 0;
    }
512

513
    block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
514
    return NULL;
515 516 517
}

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

525
    NeAACDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
526
    free( p_sys->p_buffer );
527 528
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
529 530 531 532 533

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

    /* Find the channels mapping */
541
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
542
    {
543
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
544 545 546 547 548 549 550 551 552 553
        {
            if( pi_channels_ordered[i] == pi_chan_positions[k] )
            {
                pi_chan_table[k] = j++;
                break;
            }
        }
    }

    /* Do the actual reordering */
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
554
    if( HAVE_FPU )
555 556 557 558 559 560 561 562 563
        for( i = 0; i < i_samples; i++ )
            for( j = 0; j < i_nb_channels; j++ )
                p_out[i * i_nb_channels + pi_chan_table[j]] =
                    p_in[i * i_nb_channels + j];
    else
        for( i = 0; i < i_samples; i++ )
            for( j = 0; j < i_nb_channels; j++ )
                ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
                    ((uint16_t *)p_in)[i * i_nb_channels + j];
Gildas Bazin's avatar
 
Gildas Bazin committed
564
}
565