#include "avformat.h"
#include "internal.h"
+#include "subtitles.h"
#include "libavutil/bprint.h"
#include "libavutil/intreadwrite.h"
+typedef struct {
+ FFDemuxSubtitlesQueue q;
+} SRTContext;
+
static int srt_probe(AVProbeData *p)
{
- unsigned char *ptr = p->buf;
+ const unsigned char *ptr = p->buf;
int i, v, num = 0;
if (AV_RB24(ptr) == 0xEFBBBF)
return 0;
}
-static int srt_read_header(AVFormatContext *s)
-{
- AVStream *st = avformat_new_stream(s, NULL);
- if (!st)
- return AVERROR(ENOMEM);
- avpriv_set_pts_info(st, 64, 1, 1000);
- st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
- st->codec->codec_id = AV_CODEC_ID_SUBRIP;
- return 0;
-}
-
static int64_t get_pts(const char **buf, int *duration,
int32_t *x1, int32_t *y1, int32_t *x2, int32_t *y2)
{
return AV_NOPTS_VALUE;
}
-static inline int is_eol(char c)
+static int srt_read_header(AVFormatContext *s)
{
- return c == '\r' || c == '\n';
-}
+ SRTContext *srt = s->priv_data;
+ AVBPrint buf;
+ AVStream *st = avformat_new_stream(s, NULL);
+ int res = 0;
-static void read_chunk(AVIOContext *pb, AVBPrint *buf)
-{
- char eol_buf[5];
- int n = 0, i = 0, nb_eol = 0;
-
- for (;;) {
- char c = avio_r8(pb);
-
- if (!c)
- break;
-
- /* ignore all initial line breaks */
- if (n == 0 && is_eol(c))
- continue;
-
- /* line break buffering: we don't want to add the trailing \r\n */
- if (is_eol(c)) {
- nb_eol += c == '\n';
- if (nb_eol == 2)
- break;
- eol_buf[i++] = c;
- if (i == sizeof(eol_buf) - 1)
- break;
- continue;
- }
+ if (!st)
+ return AVERROR(ENOMEM);
+ avpriv_set_pts_info(st, 64, 1, 1000);
+ st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+ st->codec->codec_id = AV_CODEC_ID_SUBRIP;
- /* only one line break followed by data: we flush the line breaks
- * buffer */
- if (i) {
- eol_buf[i] = 0;
- av_bprintf(buf, "%s", eol_buf);
- i = nb_eol = 0;
- }
+ av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
- av_bprint_chars(buf, c, 1);
- n++;
+ while (!url_feof(s->pb)) {
+ ff_subtitles_read_chunk(s->pb, &buf);
+
+ if (buf.len) {
+ int64_t pos = avio_tell(s->pb);
+ int64_t pts;
+ int duration;
+ const char *ptr = buf.str;
+ int32_t x1 = -1, y1 = -1, x2 = -1, y2 = -1;
+ AVPacket *sub;
+
+ pts = get_pts(&ptr, &duration, &x1, &y1, &x2, &y2);
+ if (pts != AV_NOPTS_VALUE) {
+ int len = buf.len - (ptr - buf.str);
+ sub = ff_subtitles_queue_insert(&srt->q, ptr, len, 0);
+ if (!sub) {
+ res = AVERROR(ENOMEM);
+ goto end;
+ }
+ sub->pos = pos;
+ sub->pts = pts;
+ sub->duration = duration;
+ if (x1 != -1) {
+ uint8_t *p = av_packet_new_side_data(sub, AV_PKT_DATA_SUBTITLE_POSITION, 16);
+ if (p) {
+ AV_WL32(p, x1);
+ AV_WL32(p + 4, y1);
+ AV_WL32(p + 8, x2);
+ AV_WL32(p + 12, y2);
+ }
+ }
+ }
+ }
}
- /* FIXME: remove the following when the lavc SubRip decoder is fixed
- * (trailing tags are not correctly flushed, see what happens to FATE when
- * you disable this code) */
- if (buf->len)
- av_bprintf(buf, "\n");
+ ff_subtitles_queue_finalize(&srt->q);
+
+end:
+ av_bprint_finalize(&buf, NULL);
+ return res;
}
static int srt_read_packet(AVFormatContext *s, AVPacket *pkt)
{
- AVBPrint buf;
- int64_t pos = avio_tell(s->pb);
- int res = AVERROR_EOF;
+ SRTContext *srt = s->priv_data;
+ return ff_subtitles_queue_read_packet(&srt->q, pkt);
+}
- av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
- read_chunk(s->pb, &buf);
-
- if (buf.len) {
- int64_t pts;
- int duration, pkt_size;
- const char *ptr = buf.str;
- int32_t x1 = -1, y1 = -1, x2 = -1, y2 = -1;
-
- pts = get_pts(&ptr, &duration, &x1, &y1, &x2, &y2);
- pkt_size = buf.len - (ptr - buf.str);
- if (pts != AV_NOPTS_VALUE && !(res = av_new_packet(pkt, pkt_size))) {
- memcpy(pkt->data, ptr, pkt->size);
- pkt->flags |= AV_PKT_FLAG_KEY;
- pkt->pos = pos;
- pkt->pts = pkt->dts = pts;
- pkt->duration = duration;
- if (x1 != -1) {
- uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SUBTITLE_POSITION, 16);
- if (p) {
- AV_WL32(p, x1);
- AV_WL32(p + 4, y1);
- AV_WL32(p + 8, x2);
- AV_WL32(p + 12, y2);
- }
- }
- }
- }
- av_bprint_finalize(&buf, NULL);
- return res;
+static int srt_read_seek(AVFormatContext *s, int stream_index,
+ int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
+{
+ SRTContext *srt = s->priv_data;
+ return ff_subtitles_queue_seek(&srt->q, s, stream_index,
+ min_ts, ts, max_ts, flags);
+}
+
+static int srt_read_close(AVFormatContext *s)
+{
+ SRTContext *srt = s->priv_data;
+ ff_subtitles_queue_clean(&srt->q);
+ return 0;
}
AVInputFormat ff_srt_demuxer = {
.name = "srt",
.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
+ .priv_data_size = sizeof(SRTContext),
.read_probe = srt_probe,
.read_header = srt_read_header,
.read_packet = srt_read_packet,
- .flags = AVFMT_GENERIC_INDEX,
+ .read_seek2 = srt_read_seek,
+ .read_close = srt_read_close,
};
projects / ffmpeg / blobdiff