generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wav: Refactor the tag checking into a switch statement

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Tomas Härdin 2011-02-17 15:58:10 +01:00 committed by Anton Khirnov
parent 1cf18de982
commit 90f2ee8cb4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/wav.c
View File

@ -334,7 +334,8 @@ static int wav_read_header(AVFormatContext *s,
size = next_tag(pb, &tag); size = next_tag(pb, &tag);
next_tag_ofs = avio_tell(pb) + size; next_tag_ofs = avio_tell(pb) + size;
if (tag == MKTAG('f', 'm', 't', ' ')) { switch (tag) {
case MKTAG('f', 'm', 't', ' '):
/* only parse the first 'fmt ' tag found */ /* only parse the first 'fmt ' tag found */
if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st) < 0)) { if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st) < 0)) {
return ret; return ret;
@ -342,18 +343,22 @@ static int wav_read_header(AVFormatContext *s,
av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n"); av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n");
got_fmt = 1; got_fmt = 1;
} else if (tag == MKTAG('d', 'a', 't', 'a')) { break;
case MKTAG('d', 'a', 't', 'a'):
if (!got_fmt) { if (!got_fmt) {
av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'data' tag\n"); av_log(s, AV_LOG_ERROR, "found no 'fmt ' tag before the 'data' tag\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
goto break_loop;
case MKTAG('f','a','c','t'):
if (!sample_count)
sample_count = avio_rl32(pb);
break; break;
}else if (tag == MKTAG('f','a','c','t') && !sample_count){
sample_count = avio_rl32(pb);
} }
avio_seek(pb, next_tag_ofs, SEEK_SET); avio_seek(pb, next_tag_ofs, SEEK_SET);
} }
break_loop:
if (rf64) if (rf64)
size = data_size; size = data_size;
if (size < 0) if (size < 0)