comparison aac_parser.c @ 6642:866b9ade048c libavcodec

Change aac and ac3 parsers to use ff_combine_frame().

6641:25a963680a88

#include "bitstream.h"
#include "mpeg4audio.h"

#define AAC_HEADER_SIZE 7

static int aac_sync(AACAC3ParseContext *hdr_info)
{
    GetBitContext bits;
    int size, rdb, ch, sr;

    init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8);

    if(get_bits(&bits, 12) != 0xfff)
        return 0;

    skip_bits1(&bits);          /* id */

}

static av_cold int aac_parse_init(AVCodecParserContext *s1)
{
    AACAC3ParseContext *s = s1->priv_data;
    s->inbuf_ptr = s->inbuf;
    s->header_size = AAC_HEADER_SIZE;
    s->sync = aac_sync;
    return 0;
}

6642:866b9ade048c

#include "bitstream.h"
#include "mpeg4audio.h"

#define AAC_HEADER_SIZE 7

static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info)
{
    GetBitContext bits;
    int size, rdb, ch, sr;
    uint64_t tmp = be2me_64(state);

    init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);

    if(get_bits(&bits, 12) != 0xfff)
        return 0;

    skip_bits1(&bits);          /* id */

}

static av_cold int aac_parse_init(AVCodecParserContext *s1)
{
    AACAC3ParseContext *s = s1->priv_data;
    s->header_size = AAC_HEADER_SIZE;
    s->sync = aac_sync;
    return 0;
}