Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Luca Barbato authored on 2014/03/11 21:29:33... | ... |
@@ -26,7 +26,6 @@ |
26 | 26 |
#include "rawdec.h" |
27 | 27 |
#include "id3v1.h" |
28 | 28 |
|
29 |
- |
|
30 | 29 |
static int adts_aac_probe(AVProbeData *p) |
31 | 30 |
{ |
32 | 31 |
int max_frames = 0, first_frames = 0; |
... | ... |
@@ -38,27 +37,33 @@ static int adts_aac_probe(AVProbeData *p) |
38 | 38 |
|
39 | 39 |
buf = buf0; |
40 | 40 |
|
41 |
- for(; buf < end; buf= buf2+1) { |
|
41 |
+ for (; buf < end; buf = buf2 + 1) { |
|
42 | 42 |
buf2 = buf; |
43 | 43 |
|
44 |
- for(frames = 0; buf2 < end; frames++) { |
|
44 |
+ for (frames = 0; buf2 < end; frames++) { |
|
45 | 45 |
uint32_t header = AV_RB16(buf2); |
46 |
- if((header&0xFFF6) != 0xFFF0) |
|
46 |
+ if ((header & 0xFFF6) != 0xFFF0) |
|
47 | 47 |
break; |
48 | 48 |
fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF; |
49 |
- if(fsize < 7) |
|
49 |
+ if (fsize < 7) |
|
50 | 50 |
break; |
51 | 51 |
buf2 += fsize; |
52 | 52 |
} |
53 | 53 |
max_frames = FFMAX(max_frames, frames); |
54 |
- if(buf == buf0) |
|
55 |
- first_frames= frames; |
|
54 |
+ if (buf == buf0) |
|
55 |
+ first_frames = frames; |
|
56 | 56 |
} |
57 |
- if (first_frames>=3) return AVPROBE_SCORE_EXTENSION + 1; |
|
58 |
- else if(max_frames>500)return AVPROBE_SCORE_EXTENSION; |
|
59 |
- else if(max_frames>=3) return AVPROBE_SCORE_EXTENSION / 2; |
|
60 |
- else if(max_frames>=1) return 1; |
|
61 |
- else return 0; |
|
57 |
+ |
|
58 |
+ if (first_frames >= 3) |
|
59 |
+ return AVPROBE_SCORE_EXTENSION + 1; |
|
60 |
+ else if (max_frames > 500) |
|
61 |
+ return AVPROBE_SCORE_EXTENSION; |
|
62 |
+ else if (max_frames >= 3) |
|
63 |
+ return AVPROBE_SCORE_EXTENSION / 2; |
|
64 |
+ else if (max_frames >= 1) |
|
65 |
+ return 1; |
|
66 |
+ else |
|
67 |
+ return 0; |
|
62 | 68 |
} |
63 | 69 |
|
64 | 70 |
static int adts_aac_read_header(AVFormatContext *s) |
... | ... |
@@ -70,24 +75,24 @@ static int adts_aac_read_header(AVFormatContext *s) |
70 | 70 |
return AVERROR(ENOMEM); |
71 | 71 |
|
72 | 72 |
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
73 |
- st->codec->codec_id = s->iformat->raw_codec_id; |
|
74 |
- st->need_parsing = AVSTREAM_PARSE_FULL; |
|
73 |
+ st->codec->codec_id = s->iformat->raw_codec_id; |
|
74 |
+ st->need_parsing = AVSTREAM_PARSE_FULL; |
|
75 | 75 |
|
76 | 76 |
ff_id3v1_read(s); |
77 | 77 |
|
78 |
- //LCM of all possible ADTS sample rates |
|
78 |
+ // LCM of all possible ADTS sample rates |
|
79 | 79 |
avpriv_set_pts_info(st, 64, 1, 28224000); |
80 | 80 |
|
81 | 81 |
return 0; |
82 | 82 |
} |
83 | 83 |
|
84 | 84 |
AVInputFormat ff_aac_demuxer = { |
85 |
- .name = "aac", |
|
86 |
- .long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), |
|
87 |
- .read_probe = adts_aac_probe, |
|
88 |
- .read_header = adts_aac_read_header, |
|
89 |
- .read_packet = ff_raw_read_partial_packet, |
|
90 |
- .flags = AVFMT_GENERIC_INDEX, |
|
91 |
- .extensions = "aac", |
|
92 |
- .raw_codec_id = AV_CODEC_ID_AAC, |
|
85 |
+ .name = "aac", |
|
86 |
+ .long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), |
|
87 |
+ .read_probe = adts_aac_probe, |
|
88 |
+ .read_header = adts_aac_read_header, |
|
89 |
+ .read_packet = ff_raw_read_partial_packet, |
|
90 |
+ .flags = AVFMT_GENERIC_INDEX, |
|
91 |
+ .extensions = "aac", |
|
92 |
+ .raw_codec_id = AV_CODEC_ID_AAC, |
|
93 | 93 |
}; |