faad.c 19.3 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 44 45 46 47 48

#include <faad.h>

/*****************************************************************************
 * 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 70 71 72

struct decoder_sys_t
{
    /* faad handler */
    faacDecHandle *hfaad;

    /* 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 127
    faacDecConfiguration *cfg;

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 138 139

    /* Open a faad context */
    if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
    {
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

Gildas Bazin's avatar
 
Gildas Bazin committed
160 161
        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
162 163
                          &i_rate, &i_channels ) < 0 )
        {
164
            msg_Err( p_dec, "Failed to initialize faad using extra data" );
Rémi Duraffort's avatar
Rémi Duraffort committed
165 166
            faacDecClose( p_sys->hfaad );
            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 = faacDecGetCurrentConfiguration( p_sys->hfaad );
Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
186
    cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT;
187 188 189
    faacDecSetConfiguration( p_sys->hfaad, cfg );

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

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

196
    p_sys->b_sbr = p_sys->b_ps = false;
197 198

    p_dec->pf_decode_audio = DecodeBlock;
199 200 201 202
    return VLC_SUCCESS;
}

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

210 211 212
    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
213

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

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

237 238 239
    /* Append the block to the temporary buffer */
    if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer )
    {
240 241 242 243 244 245 246 247 248 249 250
        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;
        }
251 252
    }

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

261 262 263 264 265 266 267 268 269 270 271 272
    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;

        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
                          &i_rate, &i_channels ) >= 0 )
        {
            p_dec->fmt_out.audio.i_rate = i_rate;
            p_dec->fmt_out.audio.i_channels = i_channels;
273 274 275 276
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[i_channels];

277
            date_Init( &p_sys->date, i_rate, 1 );
278 279 280
        }
    }

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

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

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

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

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

        samples = faacDecDecode( p_sys->hfaad, &frame,
Gildas Bazin's avatar
 
Gildas Bazin committed
323
                                 p_sys->p_buffer, p_sys->i_buffer );
324 325 326 327

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

329
            if( frame.error == 21 || frame.error == 12 )
330 331
            {
                /*
332 333
                 * Once an "Unexpected channel configuration change"
                 * or a "Invalid number of channels" error
334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370
                 * occurs, it will occurs afterwards, and we got no sound.
                 * Reinitialization of the decoder is required.
                 */
                unsigned long i_rate;
                unsigned char i_channels;
                faacDecHandle *hfaad;
                faacDecConfiguration *cfg,*oldcfg;

                oldcfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
                hfaad = faacDecOpen();
                cfg = faacDecGetCurrentConfiguration( hfaad );
                if( oldcfg->defSampleRate )
                    cfg->defSampleRate = oldcfg->defSampleRate;
                cfg->defObjectType = oldcfg->defObjectType;
                cfg->outputFormat = oldcfg->outputFormat;
                faacDecSetConfiguration( hfaad, cfg );

                if( faacDecInit( hfaad, p_sys->p_buffer, p_sys->i_buffer,
                                &i_rate,&i_channels ) < 0 )
                {
                    /* reinitialization failed */
                    faacDecClose( hfaad );
                    faacDecSetConfiguration( p_sys->hfaad, oldcfg );
                }
                else
                {
                    faacDecClose( p_sys->hfaad );
                    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
371
            /* Flush the buffer */
372
            p_sys->i_buffer = 0;
373
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
374
            return NULL;
375
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
376

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

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
382 383 384 385 386 387
            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 );
            }
388
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
389
            return NULL;
390
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
391

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    /* Find the channels mapping */
539
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
540
    {
541
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
542 543 544 545 546 547 548 549 550 551
        {
            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
552
    if( HAVE_FPU )
553 554 555 556 557 558 559 560 561
        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
562
}
563