highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aac: K&R formatting cosmetics

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Luca Barbato 2014-03-11 12:29:33 +00:00 committed by Vittorio Giovara
parent 2e708f1708
commit afdf94689c
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavformat/aacdec.c
View File

@ -26,7 +26,6 @@
#include "rawdec.h" #include "rawdec.h"
#include "id3v1.h" #include "id3v1.h"
static int adts_aac_probe(AVProbeData *p) static int adts_aac_probe(AVProbeData *p)
{ {
int max_frames = 0, first_frames = 0; int max_frames = 0, first_frames = 0;
@ -38,27 +37,33 @@ static int adts_aac_probe(AVProbeData *p)
buf = buf0; buf = buf0;
for(; buf < end; buf= buf2+1) { for (; buf < end; buf = buf2 + 1) {
buf2 = buf; buf2 = buf;
for(frames = 0; buf2 < end; frames++) { for (frames = 0; buf2 < end; frames++) {
uint32_t header = AV_RB16(buf2); uint32_t header = AV_RB16(buf2);
if((header&0xFFF6) != 0xFFF0) if ((header & 0xFFF6) != 0xFFF0)
break; break;
fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF; fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF;
if(fsize < 7) if (fsize < 7)
break; break;
buf2 += fsize; buf2 += fsize;
} }
max_frames = FFMAX(max_frames, frames); max_frames = FFMAX(max_frames, frames);
if(buf == buf0) if (buf == buf0)
first_frames= frames; first_frames = frames;
} }
if (first_frames>=3) return AVPROBE_SCORE_EXTENSION + 1;
else if(max_frames>500)return AVPROBE_SCORE_EXTENSION; if (first_frames >= 3)
else if(max_frames>=3) return AVPROBE_SCORE_EXTENSION / 2; return AVPROBE_SCORE_EXTENSION + 1;
else if(max_frames>=1) return 1; else if (max_frames > 500)
else return 0; return AVPROBE_SCORE_EXTENSION;
else if (max_frames >= 3)
return AVPROBE_SCORE_EXTENSION / 2;
else if (max_frames >= 1)
return 1;
else
return 0;
} }
static int adts_aac_read_header(AVFormatContext *s) static int adts_aac_read_header(AVFormatContext *s)
@ -70,24 +75,24 @@ static int adts_aac_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_id = s->iformat->raw_codec_id; st->codec->codec_id = s->iformat->raw_codec_id;
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
ff_id3v1_read(s); ff_id3v1_read(s);
//LCM of all possible ADTS sample rates // LCM of all possible ADTS sample rates
avpriv_set_pts_info(st, 64, 1, 28224000); avpriv_set_pts_info(st, 64, 1, 28224000);
return 0; return 0;
} }
AVInputFormat ff_aac_demuxer = { AVInputFormat ff_aac_demuxer = {
.name = "aac", .name = "aac",
.long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), .long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"),
.read_probe = adts_aac_probe, .read_probe = adts_aac_probe,
.read_header = adts_aac_read_header, .read_header = adts_aac_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "aac", .extensions = "aac",
.raw_codec_id = AV_CODEC_ID_AAC, .raw_codec_id = AV_CODEC_ID_AAC,
}; };