Mercurial > libavcodec.hg
annotate aac_parser.c @ 12530:63edd10ad4bc libavcodec tip
Try to fix crashes introduced by r25218
r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.
author | darkshikari |
---|---|
date | Tue, 28 Sep 2010 09:06:22 +0000 |
parents | e7634f1b6100 |
children |
rev | line source |
---|---|
4941 | 1 /* |
2 * Audio and Video frame extraction | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8549
diff
changeset
|
3 * Copyright (c) 2003 Fabrice Bellard |
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8549
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 | |
23 #include "parser.h" | |
24 #include "aac_ac3_parser.h" | |
12149
e7634f1b6100
Split the ADTS header decoder off of the ADTS parser.
alexc
parents:
12129
diff
changeset
|
25 #include "aacadtsdec.h" |
9428 | 26 #include "get_bits.h" |
6559 | 27 #include "mpeg4audio.h" |
4941 | 28 |
6643 | 29 static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, |
30 int *need_next_header, int *new_frame_start) | |
4941 | 31 { |
32 GetBitContext bits; | |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
33 AACADTSHeaderInfo hdr; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
34 int size; |
8360 | 35 union { |
36 uint64_t u64; | |
37 uint8_t u8[8]; | |
38 } tmp; | |
4941 | 39 |
12129 | 40 tmp.u64 = av_be2ne64(state); |
9633
9592af8b6ce0
Move the ADTS header size to the parser's header file.
alexc
parents:
9428
diff
changeset
|
41 init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); |
4941 | 42 |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
43 if ((size = ff_aac_parse_header(&bits, &hdr)) < 0) |
4941 | 44 return 0; |
6643 | 45 *need_next_header = 0; |
46 *new_frame_start = 1; | |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
47 hdr_info->sample_rate = hdr.sample_rate; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
48 hdr_info->channels = ff_mpeg4audio_channels[hdr.chan_config]; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
49 hdr_info->samples = hdr.samples; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8360
diff
changeset
|
50 hdr_info->bit_rate = hdr.bit_rate; |
4941 | 51 return size; |
52 } | |
53 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5817
diff
changeset
|
54 static av_cold int aac_parse_init(AVCodecParserContext *s1) |
4941 | 55 { |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
56 AACAC3ParseContext *s = s1->priv_data; |
9633
9592af8b6ce0
Move the ADTS header size to the parser's header file.
alexc
parents:
9428
diff
changeset
|
57 s->header_size = AAC_ADTS_HEADER_SIZE; |
4941 | 58 s->sync = aac_sync; |
59 return 0; | |
60 } | |
61 | |
62 | |
63 AVCodecParser aac_parser = { | |
64 { CODEC_ID_AAC }, | |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
65 sizeof(AACAC3ParseContext), |
4941 | 66 aac_parse_init, |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
67 ff_aac_ac3_parse, |
9016 | 68 ff_parse_close, |
4941 | 69 }; |