X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fassdec.c;h=6b9c3dea95efac1afef0d3c6f4b09601fa3e21c7;hb=45f511ece7aaf730d51dff5b086e32bc43fc78ce;hp=82e6a712d778cde6cb1b1cc71d1de59bd9c7c7ac;hpb=7a8b7634c58099402c0cb434d35fa6b9f1fd9d33;p=ffmpeg diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 82e6a712d77..6b9c3dea95e 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -2,24 +2,26 @@ * SSA/ASS demuxer * Copyright (c) 2008 Michael Niedermayer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/mathematics.h" #include "avformat.h" +#include "internal.h" #define MAX_LINESIZE 2000 @@ -30,20 +32,6 @@ typedef struct ASSContext{ unsigned int event_index; }ASSContext; -static void get_line(ByteIOContext *s, char *buf, int maxlen) -{ - int i = 0; - char c; - - do{ - c = get_byte(s); - if (i < maxlen-1) - buf[i++] = c; - }while(c != '\n' && c); - - buf[i] = 0; -} - static int probe(AVProbeData *p) { const char *header= "[Script Info]"; @@ -87,28 +75,28 @@ static int event_cmp(uint8_t **a, uint8_t **b) static int read_header(AVFormatContext *s, AVFormatParameters *ap) { - int i, header_remaining; + int i, len, header_remaining; ASSContext *ass = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; AVStream *st; int allocated[2]={0}; uint8_t *p, **dst[2]={0}; int pos[2]={0}; - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return -1; av_set_pts_info(st, 64, 1, 100); - st->codec->codec_type = CODEC_TYPE_SUBTITLE; + st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codec->codec_id= CODEC_ID_SSA; header_remaining= INT_MAX; dst[0] = &st->codec->extradata; dst[1] = &ass->event_buffer; - while(!url_feof(pb)){ + while(!pb->eof_reached){ uint8_t line[MAX_LINESIZE]; - get_line(pb, line, sizeof(line)); + len = ff_get_line(pb, line, sizeof(line)); if(!memcmp(line, "[Events]", 8)) header_remaining= 2; @@ -124,8 +112,8 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) if(!p) goto fail; *(dst[i])= p; - memcpy(p + pos[i], line, strlen(line)+1); - pos[i] += strlen(line); + memcpy(p + pos[i], line, len+1); + pos[i] += len; if(i) ass->event_count++; else header_remaining--; } @@ -143,7 +131,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) p++; } - qsort(ass->event, ass->event_count, sizeof(*ass->event), event_cmp); + qsort(ass->event, ass->event_count, sizeof(*ass->event), (void*)event_cmp); return 0; @@ -165,7 +153,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) end= strchr(p, '\n'); av_new_packet(pkt, end ? end-p+1 : strlen(p)); - pkt->flags |= PKT_FLAG_KEY; + pkt->flags |= AV_PKT_FLAG_KEY; pkt->pos= p - ass->event_buffer + s->streams[0]->codec->extradata_size; pkt->pts= pkt->dts= get_pts(p); memcpy(pkt->data, p, pkt->size); @@ -175,13 +163,53 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -AVInputFormat ass_demuxer = { - "ass", - NULL_IF_CONFIG_SMALL("SSA/ASS format"), - sizeof(ASSContext), - probe, - read_header, - read_packet, - read_close, -// read_seek, +static int read_seek2(AVFormatContext *s, int stream_index, + int64_t min_ts, int64_t ts, int64_t max_ts, int flags) +{ + ASSContext *ass = s->priv_data; + + if (flags & AVSEEK_FLAG_BYTE) { + return AVERROR(ENOSYS); + } else if (flags & AVSEEK_FLAG_FRAME) { + if (ts < 0 || ts >= ass->event_count) + return AVERROR(ERANGE); + ass->event_index = ts; + } else { + int i, idx = -1; + int64_t min_ts_diff = INT64_MAX; + if (stream_index == -1) { + AVRational time_base = s->streams[0]->time_base; + ts = av_rescale_q(ts, AV_TIME_BASE_Q, time_base); + min_ts = av_rescale_rnd(min_ts, time_base.den, + time_base.num * (int64_t)AV_TIME_BASE, + AV_ROUND_UP); + max_ts = av_rescale_rnd(max_ts, time_base.den, + time_base.num * (int64_t)AV_TIME_BASE, + AV_ROUND_DOWN); + } + /* TODO: ass->event[] is sorted by pts so we could do a binary search */ + for (i=0; ievent_count; i++) { + int64_t pts = get_pts(ass->event[i]); + int64_t ts_diff = FFABS(pts - ts); + if (pts >= min_ts && pts <= max_ts && ts_diff < min_ts_diff) { + min_ts_diff = ts_diff; + idx = i; + } + } + if (idx < 0) + return AVERROR(ERANGE); + ass->event_index = idx; + } + return 0; +} + +AVInputFormat ff_ass_demuxer = { + .name = "ass", + .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"), + .priv_data_size = sizeof(ASSContext), + .read_probe = probe, + .read_header = read_header, + .read_packet = read_packet, + .read_close = read_close, + .read_seek2 = read_seek2, };