RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/argo_brp: cleanup 'goto fail's 

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen 2020-09-19 22:05:43 +10:00
parent 3cf650bda9
commit e76102a2d8
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libavformat/argo_brp.c
View File

@ -170,17 +170,13 @@ static int argo_brp_read_header(AVFormatContext *s)
ArgoBRPStreamHeader *hdr = brp->streams + i; ArgoBRPStreamHeader *hdr = brp->streams + i;
AVStream *st; AVStream *st;
if (!(st = avformat_new_stream(s, NULL))) { if (!(st = avformat_new_stream(s, NULL)))
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
}
if ((ret = avio_read(pb, buf, BRP_STREAM_HEADER_SIZE)) < 0) { if ((ret = avio_read(pb, buf, BRP_STREAM_HEADER_SIZE)) < 0)
goto fail; return ret;
} else if (ret != BRP_STREAM_HEADER_SIZE) { else if (ret != BRP_STREAM_HEADER_SIZE)
ret = AVERROR(EIO); return AVERROR(EIO);
goto fail;
}
hdr->codec_id = AV_RL32(buf + 0); hdr->codec_id = AV_RL32(buf + 0);
hdr->id = AV_RL32(buf + 4); hdr->id = AV_RL32(buf + 4);
@ -194,7 +190,7 @@ static int argo_brp_read_header(AVFormatContext *s)
st->codecpar->bit_rate = hdr->byte_rate * 8; st->codecpar->bit_rate = hdr->byte_rate * 8;
if ((ret = read_extradata(s, hdr, buf, sizeof(buf))) < 0) { if ((ret = read_extradata(s, hdr, buf, sizeof(buf))) < 0) {
goto fail; return ret;
} else if (ret > 0) { } else if (ret > 0) {
st->codecpar->codec_type = AVMEDIA_TYPE_UNKNOWN; st->codecpar->codec_type = AVMEDIA_TYPE_UNKNOWN;
continue; continue;
@ -216,8 +212,7 @@ static int argo_brp_read_header(AVFormatContext *s)
/* These are from 1990's games, sanity check this. */ /* These are from 1990's games, sanity check this. */
if (bvid->width >= 65536 || bvid->height >= 65536 || if (bvid->width >= 65536 || bvid->height >= 65536 ||
bvid->depth > 24 || bvid->depth % 8 != 0) { bvid->depth > 24 || bvid->depth % 8 != 0) {
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto fail;
} }
st->codecpar->width = bvid->width; st->codecpar->width = bvid->width;
@ -229,8 +224,7 @@ static int argo_brp_read_header(AVFormatContext *s)
st->codecpar->format = AV_PIX_FMT_RGB24; st->codecpar->format = AV_PIX_FMT_RGB24;
} else { } else {
avpriv_request_sample(s, "depth == %u", bvid->depth); avpriv_request_sample(s, "depth == %u", bvid->depth);
ret = AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
goto fail;
} }
} else if (hdr->codec_id == BRP_CODEC_ID_BASF) { } else if (hdr->codec_id == BRP_CODEC_ID_BASF) {
/* /*
@ -240,8 +234,7 @@ static int argo_brp_read_header(AVFormatContext *s)
*/ */
if (brp->basf.index >= 0) { if (brp->basf.index >= 0) {
avpriv_request_sample(s, "Multiple BASF streams"); avpriv_request_sample(s, "Multiple BASF streams");
ret = AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
goto fail;
} }
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
@ -250,7 +243,7 @@ static int argo_brp_read_header(AVFormatContext *s)
ff_argo_asf_parse_file_header(&hdr->extradata.basf, buf); ff_argo_asf_parse_file_header(&hdr->extradata.basf, buf);
if ((ret = ff_argo_asf_validate_file_header(s, &hdr->extradata.basf)) < 0) if ((ret = ff_argo_asf_validate_file_header(s, &hdr->extradata.basf)) < 0)
goto fail; return ret;
} else { } else {
av_assert0(0); /* Caught above, should never happen. */ av_assert0(0); /* Caught above, should never happen. */
@ -271,11 +264,9 @@ static int argo_brp_read_header(AVFormatContext *s)
av_assert0(brp->streams[brp->basf.index].extradata_size == ASF_FILE_HEADER_SIZE); av_assert0(brp->streams[brp->basf.index].extradata_size == ASF_FILE_HEADER_SIZE);
if ((ret = avio_read(pb, buf, BRP_BLOCK_HEADER_SIZE)) < 0) if ((ret = avio_read(pb, buf, BRP_BLOCK_HEADER_SIZE)) < 0)
goto fail; return ret;
else if (ret != BRP_BLOCK_HEADER_SIZE) { else if (ret != BRP_BLOCK_HEADER_SIZE)
ret = AVERROR(EIO); return AVERROR(EIO);
goto fail;
}
blk.stream_id = AV_RL32(buf + 0); blk.stream_id = AV_RL32(buf + 0);
blk.start_ms = AV_RL32(buf + 4); blk.start_ms = AV_RL32(buf + 4);
@ -283,42 +274,34 @@ static int argo_brp_read_header(AVFormatContext *s)
if (blk.stream_id != brp->basf.index) { if (blk.stream_id != brp->basf.index) {
avpriv_request_sample(st, "first block not BASF"); avpriv_request_sample(st, "first block not BASF");
ret = AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
goto fail;
} }
if (blk.size < ASF_CHUNK_HEADER_SIZE) { if (blk.size < ASF_CHUNK_HEADER_SIZE)
ret = AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
goto fail;
}
if ((ret = avio_read(pb, buf, ASF_CHUNK_HEADER_SIZE)) < 0) if ((ret = avio_read(pb, buf, ASF_CHUNK_HEADER_SIZE)) < 0)
goto fail; return ret;
else if (ret != ASF_CHUNK_HEADER_SIZE) { else if (ret != ASF_CHUNK_HEADER_SIZE)
ret = AVERROR(EIO); return AVERROR(EIO);
goto fail;
}
ff_argo_asf_parse_chunk_header(&brp->basf.ckhdr, buf); ff_argo_asf_parse_chunk_header(&brp->basf.ckhdr, buf);
if ((ret = ff_argo_asf_fill_stream(st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0) if ((ret = ff_argo_asf_fill_stream(st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0)
goto fail; return ret;
/* Convert ms to samples. */ /* Convert ms to samples. */
st->start_time = (blk.start_ms * st->codecpar->sample_rate) / 1000; st->start_time = (blk.start_ms * st->codecpar->sample_rate) / 1000;
if ((ret = avio_tell(s->pb)) < 0) if ((ret = avio_tell(s->pb)) < 0)
goto fail; return ret;
brp->basf.offset = ret; brp->basf.offset = ret;
if ((ret = avio_skip(s->pb, blk.size - ASF_CHUNK_HEADER_SIZE)) < 0) if ((ret = avio_skip(s->pb, blk.size - ASF_CHUNK_HEADER_SIZE)) < 0)
goto fail; return ret;
} }
return 0; return 0;
fail:
return ret;
} }
static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt, static int argo_brp_read_basf(AVFormatContext *s, AVPacket *pkt,