*/
#include "libavutil/avstring.h"
+#include "libavutil/common.h"
#include "libavutil/parseutils.h"
#include "avcodec.h"
#include "ass.h"
if (x1 >= 0 && y1 >= 0) {
if (x2 >= 0 && y2 >= 0 && (x2 != x1 || y2 != y1))
- out += snprintf(out, out_end-out,
+ snprintf(out, out_end-out,
"{\\an1}{\\move(%d,%d,%d,%d)}", x1, y1, x2, y2);
else
- out += snprintf(out, out_end-out, "{\\an1}{\\pos(%d,%d)}", x1, y1);
+ snprintf(out, out_end-out, "{\\an1}{\\pos(%d,%d)}", x1, y1);
+ out += strlen(out);
}
for (; out < out_end && !end && *in; in++) {
}
while (out[-1] == ' ')
out--;
- out += snprintf(out, out_end-out, "\\N");
+ snprintf(out, out_end-out, "\\N");
+ if(out<out_end) out += strlen(out);
line_start = 1;
break;
case ' ':
if (stack[sptr-1].param[i][0])
for (j=sptr-2; j>=0; j--)
if (stack[j].param[i][0]) {
- out += snprintf(out, out_end-out,
+ snprintf(out, out_end-out,
"%s", stack[j].param[i]);
+ if(out<out_end) out += strlen(out);
break;
}
} else {
param++;
}
for (i=0; i<PARAM_NUMBER; i++)
- if (stack[sptr].param[i][0])
- out += snprintf(out, out_end-out,
+ if (stack[sptr].param[i][0]) {
+ snprintf(out, out_end-out,
"%s", stack[sptr].param[i]);
+ if(out<out_end) out += strlen(out);
+ }
}
} else if (!buffer[1] && strspn(buffer, "bisu") == 1) {
- out += snprintf(out, out_end-out,
+ snprintf(out, out_end-out,
"{\\%c%d}", buffer[0], !tag_close);
+ if(out<out_end) out += strlen(out);
} else {
unknown = 1;
snprintf(tmp, sizeof(tmp), "</%s>", buffer);
out -= 2;
while (out[-1] == ' ')
out--;
- out += snprintf(out, out_end-out, "\r\n");
+ snprintf(out, out_end-out, "\r\n");
return in;
}
return avpkt->size;
while (ptr < end && *ptr) {
- ptr = read_ts(ptr, &ts_start, &ts_end, &x1, &y1, &x2, &y2);
- if (!ptr)
- break;
+ if (avctx->codec->id == CODEC_ID_SRT) {
+ ptr = read_ts(ptr, &ts_start, &ts_end, &x1, &y1, &x2, &y2);
+ if (!ptr)
+ break;
+ } else {
+ // Do final divide-by-10 outside rescale to force rounding down.
+ ts_start = av_rescale_q(avpkt->pts,
+ avctx->time_base,
+ (AVRational){1,100});
+ ts_end = av_rescale_q(avpkt->pts + avpkt->duration,
+ avctx->time_base,
+ (AVRational){1,100});
+ }
ptr = srt_to_ass(avctx, buffer, buffer+sizeof(buffer), ptr,
x1, y1, x2, y2);
ff_ass_add_rect(sub, buffer, ts_start, ts_end-ts_start, 0);
return avpkt->size;
}
+#if CONFIG_SRT_DECODER
AVCodec ff_srt_decoder = {
.name = "srt",
- .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
+ .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle with embedded timing"),
.type = AVMEDIA_TYPE_SUBTITLE,
.id = AV_CODEC_ID_SRT,
.init = ff_ass_subtitle_header_default,
.decode = srt_decode_frame,
};
+#endif
+
+#if CONFIG_SUBRIP_DECODER
+AVCodec ff_subrip_decoder = {
+ .name = "subrip",
+ .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .id = AV_CODEC_ID_SUBRIP,
+ .init = ff_ass_subtitle_header_default,
+ .decode = srt_decode_frame,
+};
+#endif