} MicroDVDContext;
-static int microdvd_probe(AVProbeData *p)
+static int microdvd_probe(const AVProbeData *p)
{
unsigned char c;
const uint8_t *ptr = p->buf;
return AV_NOPTS_VALUE;
}
-static int get_duration(const char *buf)
+static int64_t get_duration(const char *buf)
{
int frame_start, frame_end;
if (sscanf(buf, "{%d}{%d}", &frame_start, &frame_end) == 2)
- return frame_end - frame_start;
+ return frame_end - (int64_t)frame_start;
return -1;
}
AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */
MicroDVDContext *microdvd = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL);
- int i = 0;
+ int i = 0, ret;
char line_buf[MAX_LINESIZE];
int has_real_fps = 0;
int64_t pos = avio_tell(s->pb);
int len = ff_get_line(s->pb, line_buf, sizeof(line_buf));
char *line = line_buf;
+ int64_t pts;
if (!strncmp(line, bom, 3))
line += 3;
if (!len)
break;
line[strcspn(line, "\r\n")] = 0;
+ if (!*p)
+ continue;
if (i++ < 3) {
int frame;
double fps;
continue;
}
if (!st->codecpar->extradata && sscanf(line, "{DEFAULT}{}%c", &c) == 1) {
- st->codecpar->extradata = av_strdup(line + 11);
- if (!st->codecpar->extradata)
- return AVERROR(ENOMEM);
- st->codecpar->extradata_size = strlen(st->codecpar->extradata) + 1;
+ int size = strlen(line + 11);
+ ret = ff_alloc_extradata(st->codecpar, size);
+ if (ret < 0)
+ goto fail;
+ memcpy(st->codecpar->extradata, line + 11, size);
continue;
}
}
SKIP_FRAME_ID;
if (!*p)
continue;
+ pts = get_pts(line);
+ if (pts == AV_NOPTS_VALUE)
+ continue;
sub = ff_subtitles_queue_insert(µdvd->q, p, strlen(p), 0);
- if (!sub)
- return AVERROR(ENOMEM);
+ if (!sub) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
sub->pos = pos;
- sub->pts = get_pts(line);
+ sub->pts = pts;
sub->duration = get_duration(line);
}
ff_subtitles_queue_finalize(s, µdvd->q);
st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codecpar->codec_id = AV_CODEC_ID_MICRODVD;
return 0;
+fail:
+ ff_subtitles_queue_clean(µdvd->q);
+ return ret;
}
static int microdvd_read_packet(AVFormatContext *s, AVPacket *pkt)