Mercurial > libavcodec.hg
annotate aac_parser.c @ 8130:c45366b01126 libavcodec
ARM: fix j_rev_dct_ARM
This is a bugfix for ARMv4 assembly implementation of 'j_rev_dct'
function.
The problem was in the incorrect partially empty row detection. Even
if the first two coefficients in the row were nonzero, it handled this
just like the case with only the first nonzero coefficient.
Now this function produces exactly the same output as the stripped
down reference C version of 'j_rev_dct' (with the nested checks like
'if (d6) { if (d2) { ...' always evaluated as true, avoiding shortcut
branches).
author | mru |
---|---|
date | Wed, 12 Nov 2008 20:23:36 +0000 |
parents | e381bf921a88 |
children | 850b735daef8 |
rev | line source |
---|---|
4941 | 1 /* |
2 * Audio and Video frame extraction | |
3 * Copyright (c) 2003 Fabrice Bellard. | |
4 * Copyright (c) 2003 Michael Niedermayer. | |
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" | |
25 #include "bitstream.h" | |
6559 | 26 #include "mpeg4audio.h" |
4941 | 27 |
28 #define AAC_HEADER_SIZE 7 | |
29 | |
6643 | 30 static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, |
31 int *need_next_header, int *new_frame_start) | |
4941 | 32 { |
33 GetBitContext bits; | |
34 int size, rdb, ch, sr; | |
8018 | 35 uint8_t tmp[8]; |
4941 | 36 |
8018 | 37 AV_WB64(tmp, state); |
38 init_get_bits(&bits, tmp+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); | |
4941 | 39 |
40 if(get_bits(&bits, 12) != 0xfff) | |
41 return 0; | |
42 | |
43 skip_bits1(&bits); /* id */ | |
44 skip_bits(&bits, 2); /* layer */ | |
45 skip_bits1(&bits); /* protection_absent */ | |
46 skip_bits(&bits, 2); /* profile_objecttype */ | |
47 sr = get_bits(&bits, 4); /* sample_frequency_index */ | |
6559 | 48 if(!ff_mpeg4audio_sample_rates[sr]) |
4941 | 49 return 0; |
50 skip_bits1(&bits); /* private_bit */ | |
51 ch = get_bits(&bits, 3); /* channel_configuration */ | |
6559 | 52 if(!ff_mpeg4audio_channels[ch]) |
4941 | 53 return 0; |
54 skip_bits1(&bits); /* original/copy */ | |
55 skip_bits1(&bits); /* home */ | |
56 | |
57 /* adts_variable_header */ | |
58 skip_bits1(&bits); /* copyright_identification_bit */ | |
59 skip_bits1(&bits); /* copyright_identification_start */ | |
60 size = get_bits(&bits, 13); /* aac_frame_length */ | |
5817
ced30500e2b1
prevent infinite loop and memcpy of negative amounts
michael
parents:
4942
diff
changeset
|
61 if(size < AAC_HEADER_SIZE) |
ced30500e2b1
prevent infinite loop and memcpy of negative amounts
michael
parents:
4942
diff
changeset
|
62 return 0; |
ced30500e2b1
prevent infinite loop and memcpy of negative amounts
michael
parents:
4942
diff
changeset
|
63 |
4941 | 64 skip_bits(&bits, 11); /* adts_buffer_fullness */ |
65 rdb = get_bits(&bits, 2); /* number_of_raw_data_blocks_in_frame */ | |
66 | |
6559 | 67 hdr_info->channels = ff_mpeg4audio_channels[ch]; |
68 hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr]; | |
6527
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6517
diff
changeset
|
69 hdr_info->samples = (rdb + 1) * 1024; |
32b984487899
Pass AACAC3ParseContext to sync() instead of individual arguments. Patch by
jbr
parents:
6517
diff
changeset
|
70 hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples; |
4941 | 71 |
6643 | 72 *need_next_header = 0; |
73 *new_frame_start = 1; | |
4941 | 74 return size; |
75 } | |
76 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
5817
diff
changeset
|
77 static av_cold int aac_parse_init(AVCodecParserContext *s1) |
4941 | 78 { |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
79 AACAC3ParseContext *s = s1->priv_data; |
4941 | 80 s->header_size = AAC_HEADER_SIZE; |
81 s->sync = aac_sync; | |
82 return 0; | |
83 } | |
84 | |
85 | |
86 AVCodecParser aac_parser = { | |
87 { CODEC_ID_AAC }, | |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
88 sizeof(AACAC3ParseContext), |
4941 | 89 aac_parse_init, |
4942
b42e963c8149
cosmetics: rename for consistency after previous aac and ac3 parsers move
aurel
parents:
4941
diff
changeset
|
90 ff_aac_ac3_parse, |
4941 | 91 NULL, |
92 }; |