mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18:44 +02:00
60d79b1df9
Now we just use one ADTS raw frame to calculate the bit rate, it's lead to a larger error when get the duration from bit rate, the improvement cumulate Nth ADTS frames to get the average bit rate. e,g used the command get the duration like: ffprobe -show_entries format=duration -i fate-suite/aac/foo.aac before this improvement dump the duration=2.173935 after this improvement dump the duration=1.979267 in fact, the real duration can be get by command like: ffmpeg -i fate-suite/aac/foo.aac -f null /dev/null with time=00:00:01.97 Also update the fate-adtstoasc_ticket3715. Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
69 lines
2.1 KiB
C
69 lines
2.1 KiB
C
/*
|
|
* Common AAC and AC-3 parser prototypes
|
|
* Copyright (c) 2003 Fabrice Bellard
|
|
* Copyright (c) 2003 Michael Niedermayer
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg 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 (at your option) any later version.
|
|
*
|
|
* FFmpeg 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_AAC_AC3_PARSER_H
|
|
#define AVCODEC_AAC_AC3_PARSER_H
|
|
|
|
#include <stdint.h>
|
|
#include "avcodec.h"
|
|
#include "parser.h"
|
|
|
|
typedef enum {
|
|
AAC_AC3_PARSE_ERROR_SYNC = -0x1030c0a,
|
|
AAC_AC3_PARSE_ERROR_BSID = -0x2030c0a,
|
|
AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a,
|
|
AAC_AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a,
|
|
AAC_AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a,
|
|
AAC_AC3_PARSE_ERROR_CRC = -0x6030c0a,
|
|
AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -0x7030c0a,
|
|
} AACAC3ParseError;
|
|
|
|
typedef struct AACAC3ParseContext {
|
|
ParseContext pc;
|
|
int frame_size;
|
|
int header_size;
|
|
int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info,
|
|
int *need_next_header, int *new_frame_start);
|
|
|
|
int channels;
|
|
int sample_rate;
|
|
int bit_rate;
|
|
int samples;
|
|
uint64_t channel_layout;
|
|
int service_type;
|
|
|
|
int remaining_size;
|
|
uint64_t state;
|
|
|
|
int need_next_header;
|
|
int frame_number;
|
|
int last_bit_rate;
|
|
enum AVCodecID codec_id;
|
|
} AACAC3ParseContext;
|
|
|
|
int ff_aac_ac3_parse(AVCodecParserContext *s1,
|
|
AVCodecContext *avctx,
|
|
const uint8_t **poutbuf, int *poutbuf_size,
|
|
const uint8_t *buf, int buf_size);
|
|
|
|
#endif /* AVCODEC_AAC_AC3_PARSER_H */
|