comparison aac_parser.c @ 6539:04763b6fd4f0 libavcodec

removal of stream_type in AACAC3ParseContext and adding AACAC3FrameFlag

6538:b8f886bce6f5

 */

#include "parser.h"
#include "aac_ac3_parser.h"
#include "bitstream.h"
#include "ac3.h"


#define AAC_HEADER_SIZE 7

static const int aac_channels[8] = {
    0, 1, 2, 3, 4, 5, 6, 8
};


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

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

    return size;
}

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

6539:04763b6fd4f0

 */

#include "parser.h"
#include "aac_ac3_parser.h"
#include "bitstream.h"


#define AAC_HEADER_SIZE 7

static const int aac_channels[8] = {
    0, 1, 2, 3, 4, 5, 6, 8
};


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

    hdr_info->channels = aac_channels[ch];
    hdr_info->sample_rate = aac_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;
}