comparison aac_parser.c @ 6565:013def14c931 libavcodec

change of aac_ac3_parser, so it is able to send complete portion of data to decoder

6564:cb31fe7bd914

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

#define AAC_HEADER_SIZE 7

static int aac_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag)
{
    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 */

    hdr_info->channels = ff_mpeg4audio_channels[ch];
    hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr];
    hdr_info->samples = (rdb + 1) * 1024;
    hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
    *flag = FRAME_COMPLETE;

    return size;
}

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;
}

6565:013def14c931

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

#define AAC_HEADER_SIZE 7

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

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

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

    skip_bits1(&bits);          /* id */

    hdr_info->channels = ff_mpeg4audio_channels[ch];
    hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr];
    hdr_info->samples = (rdb + 1) * 1024;
    hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;

    *need_next_header=0;
    *new_frame_start=1;
    return size;
}

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;
}