for (i=0; i<sub->num_rects; i++) {
const char *ass = sub->rects[i]->ass;
+ int ret;
if (sub->rects[i]->type != SUBTITLE_ASS) {
av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
return AVERROR(EINVAL);
}
-#if FF_API_ASS_TIMING
- if (!strncmp(ass, "Dialogue: ", 10)) {
- int num;
- dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num);
-
- for (; dialog && num--; dialog++) {
- if (dialog->style) {
- av_bprintf(&s->buffer, "<span region=\"");
- av_bprint_escape(&s->buffer, dialog->style, NULL,
- AV_ESCAPE_MODE_XML,
- AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
- av_bprintf(&s->buffer, "\">");
- }
-
- {
- int ret = ff_ass_split_override_codes(&ttml_callbacks, s,
- dialog->text);
- int log_level = (ret != AVERROR_INVALIDDATA ||
- avctx->err_recognition & AV_EF_EXPLODE) ?
- AV_LOG_ERROR : AV_LOG_WARNING;
-
- if (ret < 0) {
- av_log(avctx, log_level,
- "Splitting received ASS dialog failed: %s\n",
- av_err2str(ret));
-
- if (log_level == AV_LOG_ERROR)
- return ret;
- }
- }
-
- if (dialog->style)
- av_bprintf(&s->buffer, "</span>");
- }
- } else {
-#endif
- dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
- if (!dialog)
- return AVERROR(ENOMEM);
-
- if (dialog->style) {
- av_bprintf(&s->buffer, "<span region=\"");
- av_bprint_escape(&s->buffer, dialog->style, NULL,
- AV_ESCAPE_MODE_XML,
- AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
- av_bprintf(&s->buffer, "\">");
- }
-
- {
- int ret = ff_ass_split_override_codes(&ttml_callbacks, s,
- dialog->text);
- int log_level = (ret != AVERROR_INVALIDDATA ||
- avctx->err_recognition & AV_EF_EXPLODE) ?
- AV_LOG_ERROR : AV_LOG_WARNING;
-
- if (ret < 0) {
- av_log(avctx, log_level,
- "Splitting received ASS dialog text %s failed: %s\n",
- dialog->text,
- av_err2str(ret));
-
- if (log_level == AV_LOG_ERROR) {
- ff_ass_free_dialog(&dialog);
- return ret;
- }
- }
+ dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+ if (!dialog)
+ return AVERROR(ENOMEM);
- if (dialog->style)
- av_bprintf(&s->buffer, "</span>");
+ if (dialog->style) {
+ av_bprintf(&s->buffer, "<span region=\"");
+ av_bprint_escape(&s->buffer, dialog->style, NULL,
+ AV_ESCAPE_MODE_XML,
+ AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
+ av_bprintf(&s->buffer, "\">");
+ }
+ ret = ff_ass_split_override_codes(&ttml_callbacks, s, dialog->text);
+ if (ret < 0) {
+ int log_level = (ret != AVERROR_INVALIDDATA ||
+ avctx->err_recognition & AV_EF_EXPLODE) ?
+ AV_LOG_ERROR : AV_LOG_WARNING;
+ av_log(avctx, log_level,
+ "Splitting received ASS dialog text %s failed: %s\n",
+ dialog->text,
+ av_err2str(ret));
+
+ if (log_level == AV_LOG_ERROR) {
ff_ass_free_dialog(&dialog);
+ return ret;
}
-#if FF_API_ASS_TIMING
}
-#endif
+
+ if (dialog->style)
+ av_bprintf(&s->buffer, "</span>");
+
+ ff_ass_free_dialog(&dialog);
}
if (!av_bprint_is_complete(&s->buffer))
}
}
+static void ttml_get_origin(ASSScriptInfo script_info, ASSStyle style,
+ int *origin_left, int *origin_top)
+{
+ *origin_left = av_rescale(style.margin_l, 100, script_info.play_res_x);
+ *origin_top =
+ av_rescale((style.alignment >= 7) ? style.margin_v : 0,
+ 100, script_info.play_res_y);
+}
+
+static void ttml_get_extent(ASSScriptInfo script_info, ASSStyle style,
+ int *width, int *height)
+{
+ *width = av_rescale(script_info.play_res_x - style.margin_r,
+ 100, script_info.play_res_x);
+ *height = av_rescale((style.alignment <= 3) ?
+ script_info.play_res_y - style.margin_v :
+ script_info.play_res_y,
+ 100, script_info.play_res_y);
+}
+
static int ttml_write_region(AVCodecContext *avctx, AVBPrint *buf,
- ASSStyle style)
+ ASSScriptInfo script_info, ASSStyle style)
{
const char *display_alignment = NULL;
const char *text_alignment = NULL;
+ int origin_left = 0;
+ int origin_top = 0;
+ int width = 0;
+ int height = 0;
if (!style.name) {
av_log(avctx, AV_LOG_ERROR, "Subtitle style name not set!\n");
return AVERROR_INVALIDDATA;
}
+ if (style.margin_l < 0 || style.margin_r < 0 || style.margin_v < 0) {
+ av_log(avctx, AV_LOG_ERROR,
+ "One or more negative margin values in subtitle style: "
+ "left: %d, right: %d, vertical: %d!\n",
+ style.margin_l, style.margin_r, style.margin_v);
+ return AVERROR_INVALIDDATA;
+ }
+
display_alignment = ttml_get_display_alignment(style.alignment);
text_alignment = ttml_get_text_alignment(style.alignment);
if (!display_alignment || !text_alignment) {
return AVERROR_INVALIDDATA;
}
+ ttml_get_origin(script_info, style, &origin_left, &origin_top);
+ ttml_get_extent(script_info, style, &width, &height);
+
av_bprintf(buf, " <region xml:id=\"");
av_bprint_escape(buf, style.name, NULL, AV_ESCAPE_MODE_XML,
AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
av_bprintf(buf, "\"\n");
+ av_bprintf(buf, " tts:origin=\"%d%% %d%%\"\n",
+ origin_left, origin_top);
+ av_bprintf(buf, " tts:extent=\"%d%% %d%%\"\n",
+ width, height);
+
av_bprintf(buf, " tts:displayAlign=\"");
av_bprint_escape(buf, display_alignment, NULL, AV_ESCAPE_MODE_XML,
AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
av_bprintf(&s->buffer, " <layout>\n");
for (int i = 0; i < ass->styles_count; i++) {
- int ret = ttml_write_region(avctx, &s->buffer, ass->styles[i]);
+ int ret = ttml_write_region(avctx, &s->buffer, script_info,
+ ass->styles[i]);
if (ret < 0)
return ret;
}
return 0;
}
-AVCodec ff_ttml_encoder = {
+const AVCodec ff_ttml_encoder = {
.name = "ttml",
.long_name = NULL_IF_CONFIG_SMALL("TTML subtitle"),
.type = AVMEDIA_TYPE_SUBTITLE,
projects / ffmpeg / blobdiff