Mercurial > libavcodec.hg
annotate aac_ac3_parser.h @ 11300:1f512abdf680 libavcodec
Simplify code to set cbp_*
this seems 1 cpu cycle slower even though we practically just remove code.
Speed loss seems caused by the merge of if(left_type), iam commiting this
anyway as i cant imagine this to be anything but compiler messup.
author | michael |
---|---|
date | Fri, 26 Feb 2010 09:13:40 +0000 |
parents | ba5d9a97ab2f |
children |
rev | line source |
---|---|
4941 | 1 /* |
7470
1a93d3bbe3ee
cosmetics: make all references to AC-3 capitalized and hyphenated
jbr
parents:
7138
diff
changeset
|
2 * Common AAC and AC-3 parser prototypes |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8545
diff
changeset
|
3 * Copyright (c) 2003 Fabrice Bellard |
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8545
diff
changeset
|
4 * Copyright (c) 2003 Michael Niedermayer |
4941 | 5 * |
6 * This file is part of FFmpeg. | |
7 * | |
8 * FFmpeg is free software; you can redistribute it and/or | |
9 * modify it under the terms of the GNU Lesser General Public | |
10 * License as published by the Free Software Foundation; either | |
11 * version 2.1 of the License, or (at your option) any later version. | |
12 * | |
13 * FFmpeg is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
19 * License along with FFmpeg; if not, write to the Free Software | |
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
21 */ | |
22 | |
7760 | 23 #ifndef AVCODEC_AAC_AC3_PARSER_H |
24 #define AVCODEC_AAC_AC3_PARSER_H | |
4941 | 25 |
5162 | 26 #include <stdint.h> |
27 #include "avcodec.h" | |
6735 | 28 #include "parser.h" |
5162 | 29 |
8545
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
30 typedef enum { |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
31 AAC_AC3_PARSE_ERROR_SYNC = -1, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
32 AAC_AC3_PARSE_ERROR_BSID = -2, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
33 AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -3, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
34 AAC_AC3_PARSE_ERROR_FRAME_SIZE = -4, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
35 AAC_AC3_PARSE_ERROR_FRAME_TYPE = -5, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
36 AAC_AC3_PARSE_ERROR_CRC = -6, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
37 AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -7, |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
38 } AACAC3ParseError; |
a5402e89a80c
Factorise enum of AC3 error types to be usable by AAC in the ADTS patch that
superdump
parents:
7760
diff
changeset
|
39 |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
40 typedef struct AACAC3ParseContext { |
7138 | 41 ParseContext pc; |
4941 | 42 int frame_size; |
43 int header_size; | |
6643 | 44 int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info, |
45 int *need_next_header, int *new_frame_start); | |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
5830
diff
changeset
|
46 |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
5830
diff
changeset
|
47 int channels; |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
5830
diff
changeset
|
48 int sample_rate; |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
5830
diff
changeset
|
49 int bit_rate; |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
5830
diff
changeset
|
50 int samples; |
9512
ba5d9a97ab2f
Add channel layout support to the AC-3 decoder and AC-3 parser.
jbr
parents:
8977
diff
changeset
|
51 int64_t channel_layout; |
6642
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
52 |
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
53 int remaining_size; |
866b9ade048c
Change aac and ac3 parsers to use ff_combine_frame().
michael
parents:
6639
diff
changeset
|
54 uint64_t state; |
6643 | 55 |
56 int need_next_header; | |
8977 | 57 enum CodecID codec_id; |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
58 } AACAC3ParseContext; |
4941 | 59 |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
60 int ff_aac_ac3_parse(AVCodecParserContext *s1, |
4941 | 61 AVCodecContext *avctx, |
62 const uint8_t **poutbuf, int *poutbuf_size, | |
63 const uint8_t *buf, int buf_size); | |
64 | |
7760 | 65 #endif /* AVCODEC_AAC_AC3_PARSER_H */ |