virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

avcodec/(movtext|srt|ttml|webvtt)enc: Reindent after previous commit

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-25 20:33:44 +01:00 committed by James Almer
parent 1f63665ca5
commit 6c497ac93b
4 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/movtextenc.c
View File

@ -655,12 +655,12 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
mov_text_dialog(s, dialog); mov_text_dialog(s, dialog);
ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text);
ff_ass_free_dialog(&dialog); ff_ass_free_dialog(&dialog);
for (j = 0; j < box_count; j++) { for (j = 0; j < box_count; j++) {
box_types[j].encode(s); box_types[j].encode(s);

16
libavcodec/srtenc.c
View File

@ -244,14 +244,14 @@ static int encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->alignment_applied = 0; s->alignment_applied = 0;
if (avctx->codec_id == AV_CODEC_ID_SUBRIP) if (avctx->codec_id == AV_CODEC_ID_SUBRIP)
srt_style_apply(s, dialog->style); srt_style_apply(s, dialog->style);
ff_ass_split_override_codes(cb, s, dialog->text); ff_ass_split_override_codes(cb, s, dialog->text);
ff_ass_free_dialog(&dialog); ff_ass_free_dialog(&dialog);
} }
if (!av_bprint_is_complete(&s->buffer)) if (!av_bprint_is_complete(&s->buffer))

59
libavcodec/ttmlenc.c
View File

@ -88,48 +88,45 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf,
for (i=0; i<sub->num_rects; i++) { for (i=0; i<sub->num_rects; i++) {
const char *ass = sub->rects[i]->ass; const char *ass = sub->rects[i]->ass;
int ret;
if (sub->rects[i]->type != SUBTITLE_ASS) { if (sub->rects[i]->type != SUBTITLE_ASS) {
av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (dialog->style) { if (dialog->style) {
av_bprintf(&s->buffer, "<span region=\""); av_bprintf(&s->buffer, "<span region=\"");
av_bprint_escape(&s->buffer, dialog->style, NULL, av_bprint_escape(&s->buffer, dialog->style, NULL,
AV_ESCAPE_MODE_XML, AV_ESCAPE_MODE_XML,
AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
av_bprintf(&s->buffer, "\">"); av_bprintf(&s->buffer, "\">");
} }
{ ret = ff_ass_split_override_codes(&ttml_callbacks, s, dialog->text);
int ret = ff_ass_split_override_codes(&ttml_callbacks, s, if (ret < 0) {
dialog->text); int log_level = (ret != AVERROR_INVALIDDATA ||
int log_level = (ret != AVERROR_INVALIDDATA || avctx->err_recognition & AV_EF_EXPLODE) ?
avctx->err_recognition & AV_EF_EXPLODE) ? AV_LOG_ERROR : AV_LOG_WARNING;
AV_LOG_ERROR : AV_LOG_WARNING; av_log(avctx, log_level,
"Splitting received ASS dialog text %s failed: %s\n",
if (ret < 0) { dialog->text,
av_log(avctx, log_level, av_err2str(ret));
"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 (dialog->style)
av_bprintf(&s->buffer, "</span>");
if (log_level == AV_LOG_ERROR) {
ff_ass_free_dialog(&dialog); ff_ass_free_dialog(&dialog);
return ret;
} }
}
if (dialog->style)
av_bprintf(&s->buffer, "</span>");
ff_ass_free_dialog(&dialog);
} }
if (!av_bprint_is_complete(&s->buffer)) if (!av_bprint_is_complete(&s->buffer))

12
libavcodec/webvttenc.c
View File

@ -171,12 +171,12 @@ static int webvtt_encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dialog = ff_ass_split_dialog2(s->ass_ctx, ass); dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
if (!dialog) if (!dialog)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
webvtt_style_apply(s, dialog->style); webvtt_style_apply(s, dialog->style);
ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text); ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text);
ff_ass_free_dialog(&dialog); ff_ass_free_dialog(&dialog);
} }
if (!av_bprint_is_complete(&s->buffer)) if (!av_bprint_is_complete(&s->buffer))