opensourcemirror
/
mpv
mirror of https://github.com/mpv-player/mpv.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sub/lavc_conv: set dvb teletext and arib caption output type to ASS 

Also set teletext page while at it.
This commit is contained in:
Kacper Michajłow 2024-03-23 09:45:00 +01:00
parent 73779a8c70
commit 35c6b62ddc
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sub/lavc_conv.c
View File

@ -32,6 +32,7 @@
struct lavc_conv {
struct mp_log *log;
struct mp_subtitle_opts *opts;
AVCodecContext *avctx;
AVPacket *avpkt;
AVPacket *avpkt_vtt;
@ -70,6 +71,7 @@ struct lavc_conv *lavc_conv_create(struct sd *sd)
{
struct lavc_conv *priv = talloc_zero(NULL, struct lavc_conv);
priv->log = sd->log;
priv->opts = sd->opts;
priv->cur_list = talloc_array(priv, char*, 0);
priv->codec = talloc_strdup(priv, sd->codec->codec);
AVCodecContext *avctx = NULL;
@ -89,6 +91,15 @@ struct lavc_conv *lavc_conv_create(struct sd *sd)
if (!priv->avpkt || !priv->avpkt_vtt)
goto error;
switch (codec->id) {
case AV_CODEC_ID_DVB_TELETEXT:
av_dict_set_int(&opts, "txt_format", 2, 0);
break;
case AV_CODEC_ID_ARIB_CAPTION:
av_dict_set_int(&opts, "sub_type", SUBTITLE_ASS, 0);
break;
}
#if LIBAVCODEC_VERSION_MAJOR < 59
av_dict_set(&opts, "sub_text_format", "ass", 0);
#endif
@ -249,6 +260,18 @@ char **lavc_conv_decode(struct lavc_conv *priv, struct demux_packet *packet,
curr_pkt = priv->avpkt_vtt;
}
if (avctx->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
if (!priv->opts->teletext_page) {
av_opt_set(avctx, "txt_page", "subtitle", AV_OPT_SEARCH_CHILDREN);
} else if (priv->opts->teletext_page == -1) {
av_opt_set(avctx, "txt_page", "*", AV_OPT_SEARCH_CHILDREN);
} else {
char page[4];
snprintf(page, sizeof(page), "%d", priv->opts->teletext_page);
av_opt_set(avctx, "txt_page", page, AV_OPT_SEARCH_CHILDREN);
}
}
ret = avcodec_decode_subtitle2(avctx, &priv->cur, &got_sub, curr_pkt);
if (ret < 0) {
MP_ERR(priv, "Error decoding subtitle\n");