Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpegts: Forward error codes in various functions

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
pull/293/head
Keiji Costantini 11 years ago committed by Vittorio Giovara
parent 86ba2327e1
commit ca80e15814
1 changed files with 61 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 109
      libavformat/mpegts.c

109
libavformat/mpegts.c
Unescape View File

@ -440,7 +440,7 @@ static int get_packet_size(const uint8_t *buf, int size)
int score, fec_score, dvhs_score;
if (size < (TS_FEC_PACKET_SIZE * 5 + 1))
return -1;
return AVERROR_INVALIDDATA;
score = analyze(buf, size, TS_PACKET_SIZE, NULL);
dvhs_score = analyze(buf, size, TS_DVHS_PACKET_SIZE, NULL);
@ -455,7 +455,7 @@ static int get_packet_size(const uint8_t *buf, int size)
else if (score < fec_score && dvhs_score < fec_score)
return TS_FEC_PACKET_SIZE;
else
return -1;
return AVERROR_INVALIDDATA;
}
typedef struct SectionHeader {
@ -473,7 +473,7 @@ static inline int get8(const uint8_t **pp, const uint8_t *p_end)
p = *pp;
if (p >= p_end)
return -1;
return AVERROR_INVALIDDATA;
c = *p++;
*pp = p;
return c;
@ -486,7 +486,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end)
p = *pp;
if ((p + 1) >= p_end)
return -1;
return AVERROR_INVALIDDATA;
c = AV_RB16(p);
p += 2;
*pp = p;
@ -523,24 +523,24 @@ static int parse_section_header(SectionHeader *h,
val = get8(pp, p_end);
if (val < 0)
return -1;
return val;
h->tid = val;
*pp += 2;
val = get16(pp, p_end);
if (val < 0)
return -1;
return val;
h->id = val;
val = get8(pp, p_end);
if (val < 0)
return -1;
return val;
h->version = (val >> 1) & 0x1f;
val = get8(pp, p_end);
if (val < 0)
return -1;
return val;
h->sec_num = val;
val = get8(pp, p_end);
if (val < 0)
return -1;
return val;
h->last_sec_num = val;
return 0;
}
@ -873,7 +873,7 @@ skip:
case MPEGTS_PESHEADER:
len = PES_HEADER_SIZE - pes->data_index;
if (len < 0)
return -1;
return AVERROR_INVALIDDATA;
if (len > buf_size)
len = buf_size;
memcpy(pes->header + pes->data_index, p, len);
@ -888,7 +888,7 @@ skip:
case MPEGTS_PESHEADER_FILL:
len = pes->pes_header_size - pes->data_index;
if (len < 0)
return -1;
return AVERROR_INVALIDDATA;
if (len > buf_size)
len = buf_size;
memcpy(pes->header + pes->data_index, p, len);
@ -1050,8 +1050,9 @@ static int parse_mp4_descr(MP4DescrParseContext *d, int64_t off, int len,
static int parse_mp4_descr_arr(MP4DescrParseContext *d, int64_t off, int len)
{
while (len > 0) {
if (parse_mp4_descr(d, off, len, 0) < 0)
return -1;
int ret = parse_mp4_descr(d, off, len, 0);
if (ret < 0)
return ret;
update_offsets(&d->pb, &off, &len);
}
return 0;
@ -1087,7 +1088,7 @@ static int parse_MP4ESDescrTag(MP4DescrParseContext *d, int64_t off, int len)
{
int es_id = 0;
if (d->descr_count >= d->max_descr_count)
return -1;
return AVERROR_INVALIDDATA;
ff_mp4_parse_es_descr(&d->pb, &es_id);
d->active_descr = d->descr + (d->descr_count++);
@ -1106,7 +1107,7 @@ static int parse_MP4DecConfigDescrTag(MP4DescrParseContext *d, int64_t off,
{
Mp4Descr *descr = d->active_descr;
if (!descr)
return -1;
return AVERROR_INVALIDDATA;
d->active_descr->dec_config_descr = av_malloc(len);
if (!descr->dec_config_descr)
return AVERROR(ENOMEM);
@ -1120,7 +1121,7 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len)
Mp4Descr *descr = d->active_descr;
int predefined;
if (!descr)
return -1;
return AVERROR_INVALIDDATA;
predefined = avio_r8(&d->pb);
if (!predefined) {
@ -1158,7 +1159,7 @@ static int parse_mp4_descr(MP4DescrParseContext *d, int64_t off, int len,
av_log(d->s, AV_LOG_ERROR,
"Tag %x length violation new length %d bytes remaining %d\n",
tag, len1, len);
return -1;
return AVERROR_INVALIDDATA;
}
if (d->level++ >= MAX_LEVEL) {
@ -1190,6 +1191,7 @@ static int parse_mp4_descr(MP4DescrParseContext *d, int64_t off, int len,
break;
}
done:
d->level--;
avio_seek(&d->pb, off + len1, SEEK_SET);
@ -1200,26 +1202,32 @@ static int mp4_read_iods(AVFormatContext *s, const uint8_t *buf, unsigned size,
Mp4Descr *descr, int *descr_count, int max_descr_count)
{
MP4DescrParseContext d;
if (init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count) < 0)
return -1;
int ret;
ret = init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count);
if (ret < 0)
return ret;
parse_mp4_descr(&d, avio_tell(&d.pb), size, MP4IODescrTag);
ret = parse_mp4_descr(&d, avio_tell(&d.pb), size, MP4IODescrTag);
*descr_count = d.descr_count;
return 0;
return ret;
}
static int mp4_read_od(AVFormatContext *s, const uint8_t *buf, unsigned size,
Mp4Descr *descr, int *descr_count, int max_descr_count)
{
MP4DescrParseContext d;
if (init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count) < 0)
return -1;
int ret;
ret = init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count);
if (ret < 0)
return ret;
parse_mp4_descr_arr(&d, avio_tell(&d.pb), size);
ret = parse_mp4_descr_arr(&d, avio_tell(&d.pb), size);
*descr_count = d.descr_count;
return 0;
return ret;
}
static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section,
@ -1300,13 +1308,13 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
desc_tag = get8(pp, desc_list_end);
if (desc_tag < 0)
return -1;
return AVERROR_INVALIDDATA;
desc_len = get8(pp, desc_list_end);
if (desc_len < 0)
return -1;
return AVERROR_INVALIDDATA;
desc_end = *pp + desc_len;
if (desc_end > desc_list_end)
return -1;
return AVERROR_INVALIDDATA;
av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
@ -1804,7 +1812,7 @@ static int mpegts_resync(AVFormatContext *s)
for (i = 0; i < MAX_RESYNC_SIZE; i++) {
c = avio_r8(pb);
if (pb->eof_reached)
return -1;
return AVERROR_EOF;
if (c == 0x47) {
avio_seek(pb, -1, SEEK_CUR);
return 0;
@ -1813,10 +1821,10 @@ static int mpegts_resync(AVFormatContext *s)
av_log(s, AV_LOG_ERROR,
"max resync size reached, could not find sync byte\n");
/* no sync found */
return -1;
return AVERROR_INVALIDDATA;
}
/* return -1 if error or EOF. Return 0 if OK. */
/* return AVERROR_something if error or EOF. Return 0 if OK. */
static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size,
const uint8_t **data)
{
@ -1903,7 +1911,7 @@ static int mpegts_probe(AVProbeData *p)
#define CHECK_COUNT 10
if (check_count < CHECK_COUNT)
return -1;
return AVERROR_INVALIDDATA;
score = analyze(p->buf, TS_PACKET_SIZE * check_count,
TS_PACKET_SIZE, NULL) * CHECK_COUNT / check_count;
@ -1923,7 +1931,7 @@ static int mpegts_probe(AVProbeData *p)
else if (fec_score > 6)
return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT;
else
return -1;
return AVERROR_INVALIDDATA;
}
/* return the 90kHz PCR and the extension for the 27MHz PCR. return
@ -1936,18 +1944,18 @@ static int parse_pcr(int64_t *ppcr_high, int *ppcr_low, const uint8_t *packet)
afc = (packet[3] >> 4) & 3;
if (afc <= 1)
return -1;
return AVERROR_INVALIDDATA;
p = packet + 4;
len = p[0];
p++;
if (len == 0)
return -1;
return AVERROR_INVALIDDATA;
flags = *p++;
len--;
if (!(flags & 0x10))
return -1;
return AVERROR_INVALIDDATA;
if (len < 6)
return -1;
return AVERROR_INVALIDDATA;
v = AV_RB32(p);
*ppcr_high = ((int64_t) v << 1) | (p[4] >> 7);
*ppcr_low = ((p[4] & 1) << 8) | p[5];
@ -1965,11 +1973,13 @@ static int mpegts_read_header(AVFormatContext *s)
/* read the first 1024 bytes to get packet size */
pos = avio_tell(pb);
len = avio_read(pb, buf, sizeof(buf));
if (len < 0)
return len;
if (len != sizeof(buf))
goto fail;
return AVERROR_BUG;
ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
if (ts->raw_packet_size <= 0)
goto fail;
return AVERROR_INVALIDDATA;
ts->stream = s;
ts->auto_guess = 0;
@ -2004,7 +2014,7 @@ static int mpegts_read_header(AVFormatContext *s)
st = avformat_new_stream(s, NULL);
if (!st)
goto fail;
return AVERROR(ENOMEM);
avpriv_set_pts_info(st, 60, 1, 27000000);
st->codec->codec_type = AVMEDIA_TYPE_DATA;
st->codec->codec_id = AV_CODEC_ID_MPEG2TS;
@ -2016,7 +2026,7 @@ static int mpegts_read_header(AVFormatContext *s)
for (;;) {
ret = read_packet(s, packet, ts->raw_packet_size, &data);
if (ret < 0)
return -1;
return ret;
pid = AV_RB16(data + 1) & 0x1fff;
if ((pcr_pid == -1 || pcr_pid == pid) &&
parse_pcr(&pcr_h, &pcr_l, data) == 0) {
@ -2046,8 +2056,6 @@ static int mpegts_read_header(AVFormatContext *s)
avio_seek(pb, pos, SEEK_SET);
return 0;
fail:
return -1;
}
#define MAX_PACKET_READAHEAD ((128 * 1024) / 188)
@ -2192,16 +2200,21 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t target_ts, in
MpegTSContext *ts = s->priv_data;
uint8_t buf[TS_PACKET_SIZE];
int64_t pos;
int ret;
if (ff_seek_frame_binary(s, stream_index, target_ts, flags) < 0)
return -1;
ret = ff_seek_frame_binary(s, stream_index, target_ts, flags);
if (ret < 0)
return ret;
pos = avio_tell(s->pb);
for (;;) {
avio_seek(s->pb, pos, SEEK_SET);
if (avio_read(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
return -1;
ret = avio_read(s->pb, buf, TS_PACKET_SIZE);
if (ret < 0)
return ret;
if (ret != TS_PACKET_SIZE)
return AVERROR_EOF;
// pid = AV_RB16(buf + 1) & 0x1fff;
if (buf[1] & 0x40)
break;
@ -2243,7 +2256,7 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
if (ts->stop_parse > 0)
break;
if (len < TS_PACKET_SIZE)
return -1;
return AVERROR_INVALIDDATA;
if (buf[0] != 0x47) {
buf++;
len--;

Write Preview
Loading…
Cancel
Save