har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/codec_desc.c: remove AV_CODEC_PROP_TEXT_SUB property from ARIB_CAPTION

Browse Source 
To support bitmap subtitle output, remove AV_CODEC_PROP_TEXT_SUB
property from codec descriptor for AV_CODEC_ID_ARIB_CAPTION.
This is similar to `libavcodec/libzvbi-teletextdec.c`
(AV_CODEC_ID_DVB_TELETEXT).

Instead, each subtitle decoder has to specify a subtitile format.
`libavcodec/libaribb24.c` uses same AV_CODEC_ID_ARIB_CAPTION and
expects AV_CODEC_PROP_TEXT_SUB to be set, so this adds a line to
specify a format there.

Signed-off-by: rcombs <rcombs@rcombs.me>
This commit is contained in:
TADANO Tokumei 2023-02-23 19:17:16 +09:00 committed by rcombs
parent d6e30291db
commit e1dc78a13d
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/codec_desc.c
View File

@ -3550,7 +3550,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_SUBTITLE, .type = AVMEDIA_TYPE_SUBTITLE,
.name = "arib_caption", .name = "arib_caption",
.long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"), .long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"),
.props = AV_CODEC_PROP_TEXT_SUB,
.profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles), .profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles),
}, },

1
libavcodec/libaribb24.c
View File

@ -291,6 +291,7 @@ next_region:
av_log(avctx, AV_LOG_DEBUG, "Styled ASS line: %s\n", av_log(avctx, AV_LOG_DEBUG, "Styled ASS line: %s\n",
buf.str); buf.str);
sub->format = 1; /* text */
ret = ff_ass_add_rect(sub, buf.str, b24->read_order++, ret = ff_ass_add_rect(sub, buf.str, b24->read_order++,
0, NULL, NULL); 0, NULL, NULL);
} }