faad.c 17.2 KB
Newer Older
1 2 3
/*****************************************************************************
 * decoder.c: AAC decoder using libfaad2
 *****************************************************************************
4
 * Copyright (C) 2001, 2003 the VideoLAN team
5
 * $Id$
6 7
 *
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
 *          Gildas Bazin <gbazin@videolan.org>
9 10 11 12 13 14 15 16 17 18 19 20 21
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (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
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
Antoine Cellerier's avatar
Antoine Cellerier committed
22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23 24
 *****************************************************************************/

25 26 27 28
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

29
#include <vlc/vlc.h>
30
#include <vlc_plugin.h>
Clément Stenac's avatar
Clément Stenac committed
31 32 33
#include <vlc_aout.h>
#include <vlc_codec.h>
#include <vlc_input.h>
34 35 36 37 38 39 40

#include <faad.h>

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open( vlc_object_t * );
41
static void Close( vlc_object_t * );
42 43

vlc_module_begin();
44
    set_description( N_("AAC audio decoder (using libfaad2)") );
45
    set_capability( "decoder", 100 );
Clément Stenac's avatar
Clément Stenac committed
46 47
    set_category( CAT_INPUT );
    set_subcategory( SUBCAT_INPUT_ACODEC );
48
    set_callbacks( Open, Close );
49 50 51 52 53
vlc_module_end();

/****************************************************************************
 * Local prototypes
 ****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
54
static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
55
static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
56 57

#define MAX_CHANNEL_POSITIONS 9
58 59 60 61 62 63 64

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

    /* samples */
Gildas Bazin's avatar
 
Gildas Bazin committed
65
    audio_date_t date;
66 67

    /* temporary buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
68 69
    uint8_t *p_buffer;
    int     i_buffer;
70
    size_t  i_buffer_size;
71

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

75
    bool b_sbr, b_ps;
76 77

    int i_input_rate;
78 79
};

Gildas Bazin's avatar
 
Gildas Bazin committed
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
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
    };
96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
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
112

113
/*****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
114
 * OpenDecoder: probe the decoder and return score
115
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
116
static int Open( vlc_object_t *p_this )
117
{
Gildas Bazin's avatar
 
Gildas Bazin committed
118
    decoder_t *p_dec = (decoder_t*)p_this;
119 120 121
    decoder_sys_t *p_sys = p_dec->p_sys;
    faacDecConfiguration *cfg;

Gildas Bazin's avatar
 
Gildas Bazin committed
122
    if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') )
123
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
124 125 126 127 128 129
        return VLC_EGENERIC;
    }

    /* Allocate the memory needed to store the decoder's structure */
    if( ( p_dec->p_sys = p_sys =
          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
130
        return VLC_ENOMEM;
131 132 133 134

    /* Open a faad context */
    if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
    {
Benjamin Pracht's avatar
Benjamin Pracht committed
135
        msg_Err( p_dec, "cannot initialize faad" );
136 137 138
        return VLC_EGENERIC;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
139 140 141
    /* Misc init */
    aout_DateSet( &p_sys->date, 0 );
    p_dec->fmt_out.i_cat = AUDIO_ES;
142

143
    if (vlc_CPU() & CPU_CAPABILITY_FPU)
144 145
        p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
    else
146
        p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
Gildas Bazin's avatar
 
Gildas Bazin committed
147 148
    p_dec->pf_decode_audio = DecodeBlock;

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
158 159
        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
                          p_dec->fmt_in.i_extra,
160 161 162 163 164
                          &i_rate, &i_channels ) < 0 )
        {
            return VLC_EGENERIC;
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
165 166
        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
167 168 169
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
Gildas Bazin's avatar
 
Gildas Bazin committed
170
        aout_DateInit( &p_sys->date, i_rate );
171 172 173 174
    }
    else
    {
        /* Will be initalised from first frame */
Gildas Bazin's avatar
 
Gildas Bazin committed
175 176
        p_dec->fmt_out.audio.i_rate = 0;
        p_dec->fmt_out.audio.i_channels = 0;
177 178
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
179
    /* Set the faad config */
180
    cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
181
    if (vlc_CPU() & CPU_CAPABILITY_FPU)
182 183
        cfg->outputFormat = FAAD_FMT_FLOAT;
    else
184
        cfg->outputFormat = FAAD_FMT_16BIT;
185 186 187
    faacDecSetConfiguration( p_sys->hfaad, cfg );

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

191 192
    p_sys->i_input_rate = INPUT_RATE_DEFAULT;

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 199 200
    return VLC_SUCCESS;
}

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

Gildas Bazin's avatar
 
Gildas Bazin committed
208 209 210
    if( !pp_block || !*pp_block ) return NULL;

    p_block = *pp_block;
211

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

218 219 220
    if( p_block->i_rate > 0 )
        p_sys->i_input_rate = p_block->i_rate;

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

240 241 242
    /* Append the block to the temporary buffer */
    if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
243
        p_sys->i_buffer_size = p_sys->i_buffer + p_block->i_buffer;
244 245 246
        p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size );
    }

247
    if( p_block->i_buffer > 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
248
    {
249
        vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
250
                     p_block->p_buffer, p_block->i_buffer );
Gildas Bazin's avatar
 
Gildas Bazin committed
251 252 253 254
        p_sys->i_buffer += p_block->i_buffer;
        p_block->i_buffer = 0;
    }

255 256 257 258 259 260 261 262 263 264 265 266
    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;
267 268 269 270
            p_dec->fmt_out.audio.i_physical_channels
                = p_dec->fmt_out.audio.i_original_channels
                = pi_channels_guessed[i_channels];

271 272 273 274
            aout_DateInit( &p_sys->date, i_rate );
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
275
    if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
276
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
277 278
        unsigned long i_rate;
        unsigned char i_channels;
279 280 281 282 283 284

        /* Init faad with the first frame */
        if( faacDecInit( p_sys->hfaad,
                         p_sys->p_buffer, p_sys->i_buffer,
                         &i_rate, &i_channels ) < 0 )
        {
285
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
286
            return NULL;
287
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
288 289 290

        p_dec->fmt_out.audio.i_rate = i_rate;
        p_dec->fmt_out.audio.i_channels = i_channels;
291 292 293
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[i_channels];
Gildas Bazin's avatar
 
Gildas Bazin committed
294 295 296 297 298 299 300 301 302 303 304 305 306
        aout_DateInit( &p_sys->date, i_rate );
    }

    if( p_block->i_pts != 0 && p_block->i_pts != aout_DateGet( &p_sys->date ) )
    {
        aout_DateSet( &p_sys->date, p_block->i_pts );
    }
    else if( !aout_DateGet( &p_sys->date ) )
    {
        /* We've just started the stream, wait for the first PTS. */
        block_Release( p_block );
        p_sys->i_buffer = 0;
        return NULL;
307 308 309
    }

    /* Decode all data */
Gildas Bazin's avatar
 
Gildas Bazin committed
310
    if( p_sys->i_buffer )
311 312 313
    {
        void *samples;
        faacDecFrameInfo frame;
Gildas Bazin's avatar
 
Gildas Bazin committed
314
        aout_buffer_t *p_out;
Gildas Bazin's avatar
 
Gildas Bazin committed
315
        int i, j;
316 317

        samples = faacDecDecode( p_sys->hfaad, &frame,
Gildas Bazin's avatar
 
Gildas Bazin committed
318
                                 p_sys->p_buffer, p_sys->i_buffer );
319 320 321 322

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

            /* Flush the buffer */
325
            p_sys->i_buffer = 0;
326
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
327
            return NULL;
328
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
329

Gildas Bazin's avatar
 
Gildas Bazin committed
330
        if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 )
331
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
332
            msg_Warn( p_dec, "invalid channels count: %i", frame.channels );
Gildas Bazin's avatar
 
Gildas Bazin committed
333 334

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
335 336 337 338 339 340
            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 );
            }
341
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
342
            return NULL;
343
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
344

345 346
        if( frame.samples <= 0 )
        {
Benjamin Pracht's avatar
Benjamin Pracht committed
347
            msg_Warn( p_dec, "decoded zero sample" );
Gildas Bazin's avatar
 
Gildas Bazin committed
348 349

            /* Flush the buffer */
Gildas Bazin's avatar
 
Gildas Bazin committed
350 351 352 353 354 355
            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 );
            }
356
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
357
            return NULL;
358 359
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
360 361
        /* We decoded a valid frame */
        if( p_dec->fmt_out.audio.i_rate != frame.samplerate )
362
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
363 364
            aout_DateInit( &p_sys->date, frame.samplerate );
            aout_DateSet( &p_sys->date, p_block->i_pts );
365
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
366
        p_block->i_pts = 0;  /* PTS is valid only once */
367

Gildas Bazin's avatar
 
Gildas Bazin committed
368 369
        p_dec->fmt_out.audio.i_rate = frame.samplerate;
        p_dec->fmt_out.audio.i_channels = frame.channels;
370 371 372
        p_dec->fmt_out.audio.i_physical_channels
            = p_dec->fmt_out.audio.i_original_channels
            = pi_channels_guessed[frame.channels];
373

374 375 376 377
        /* Adjust stream info when dealing with SBR/PS */
        if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
            p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
        {
378 379 380
            input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
            char *psz_cat;
            const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
Laurent Aimar's avatar
Laurent Aimar committed
381
                                    frame.sbr ? "SBR" : "PS";
382

383 384 385 386 387 388 389 390 391 392 393 394 395 396
            msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
                    psz_ext, frame.channels, frame.samplerate );

            if( asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id ) != -1 )
            {
                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                            _("AAC extension"), "%s", psz_ext );
                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                            _("Channels"), "%d", frame.channels );
                input_Control( p_input, INPUT_ADD_INFO, psz_cat,
                            _("Sample rate"), _("%d Hz"), frame.samplerate );
                free( psz_cat );
            }
            p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
397
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
398 399

        /* Convert frame.channel_position to our own channel values */
400
        p_dec->fmt_out.audio.i_physical_channels = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
401 402 403 404 405 406 407 408
        for( i = 0; i < frame.channels; i++ )
        {
            /* Find the channel code */
            for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ )
            {
                if( frame.channel_position[i] == pi_channels_in[j] )
                    break;
            }
409
            if( j >= MAX_CHANNEL_POSITIONS )
410
            {
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
411
                msg_Warn( p_dec, "unknown channel ordering" );
412 413
                /* Invent something */
                j = i;
414
            }
415 416 417 418 419 420
            /* */
            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
421 422 423 424 425
        }
        p_dec->fmt_out.audio.i_original_channels =
            p_dec->fmt_out.audio.i_physical_channels;

        p_out = p_dec->pf_aout_buffer_new(p_dec, frame.samples/frame.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
426
        if( p_out == NULL )
427
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
428
            p_sys->i_buffer = 0;
429
            block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
430
            return NULL;
431 432
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
433 434
        p_out->start_date = aout_DateGet( &p_sys->date );
        p_out->end_date = aout_DateIncrement( &p_sys->date,
435
            (frame.samples / frame.channels) * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
Gildas Bazin's avatar
 
Gildas Bazin committed
436

437
        DoReordering( (uint32_t *)p_out->p_buffer, samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
438 439
                      frame.samples / frame.channels, frame.channels,
                      p_sys->pi_channel_positions );
440

Gildas Bazin's avatar
 
Gildas Bazin committed
441 442
        p_sys->i_buffer -= frame.bytesconsumed;
        if( p_sys->i_buffer > 0 )
443
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
444 445
            memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed],
                     p_sys->i_buffer );
446 447
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
448
        return p_out;
449 450
    }

451
    block_Release( p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
452
    return NULL;
453 454 455
}

/*****************************************************************************
456
 * Close:
457
 *****************************************************************************/
458
static void Close( vlc_object_t *p_this )
459
{
Gildas Bazin's avatar
 
Gildas Bazin committed
460
    decoder_t *p_dec = (decoder_t *)p_this;
461 462 463
    decoder_sys_t *p_sys = p_dec->p_sys;

    faacDecClose( p_sys->hfaad );
Rémi Duraffort's avatar
Rémi Duraffort committed
464
    free( p_sys->p_buffer );
465 466
    free( p_sys );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
467 468 469 470 471

/*****************************************************************************
 * DoReordering: do some channel re-ordering (the ac3 channel order is
 *   different from the aac one).
 *****************************************************************************/
472
static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
Gildas Bazin's avatar
 
Gildas Bazin committed
473 474 475 476 477 478
                          int i_nb_channels, uint32_t *pi_chan_positions )
{
    int pi_chan_table[MAX_CHANNEL_POSITIONS];
    int i, j, k;

    /* Find the channels mapping */
479
    for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
480
    {
481
        for( k = 0; k < i_nb_channels; k++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
482 483 484 485 486 487 488 489 490 491
        {
            if( pi_channels_ordered[i] == pi_chan_positions[k] )
            {
                pi_chan_table[k] = j++;
                break;
            }
        }
    }

    /* Do the actual reordering */
492
    if( vlc_CPU() & CPU_CAPABILITY_FPU )
493 494 495 496 497 498 499 500 501
        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
502
}
503