add ISDB-S/T subtitle decoder

0p1pp1 · Jun 25, 2017 · 7757871426c285c913a27771c11e9c0e5c80259d · 7757871
1 parent 8582a92
commit 7757871426c285c913a27771c11e9c0e5c80259d
Unified Split

Showing with 2,352 additions and 1 deletion.

+1 −0 libavcodec/Makefile

+1 −0 libavcodec/allcodecs.c

+2 −0 libavcodec/avcodec.h

+7 −0 libavcodec/codec_desc.c

+2,323 −0 libavcodec/isdbsubdec.c

+18 −1 libavformat/mpegts.c
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -361,6 +361,7 @@ OBJS-$(CONFIG_INDEO5_DECODER)          += indeo5.o ivi.o
 OBJS-$(CONFIG_INTERPLAY_ACM_DECODER)   += interplayacm.o
 OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER)  += dpcm.o
 OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o
+OBJS-$(CONFIG_ISDBSUB_DECODER)         += isdbsubdec.o
 OBJS-$(CONFIG_JACOSUB_DECODER)         += jacosubdec.o ass.o
 OBJS-$(CONFIG_JPEG2000_ENCODER)        += j2kenc.o mqcenc.o mqc.o jpeg2000.o \
                                           jpeg2000dwt.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -586,6 +586,7 @@ static void register_all(void)
     REGISTER_DECODER(VPLAYER,           vplayer);
     REGISTER_ENCDEC (WEBVTT,            webvtt);
     REGISTER_ENCDEC (XSUB,              xsub);
+    REGISTER_DECODER(ISDBSUB,           isdbsub);
 
     /* external libraries */
     REGISTER_ENCDEC (AAC_AT,            aac_at);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -646,6 +646,8 @@ enum AVCodecID {
     AV_CODEC_ID_DVB_TELETEXT,
     AV_CODEC_ID_SRT,
 
+    AV_CODEC_ID_ISDB_SUBTITLE = 0x17400,
+
     AV_CODEC_ID_MICRODVD   = 0x17800,
     AV_CODEC_ID_EIA_608,
     AV_CODEC_ID_JACOSUB,

diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
@@ -2988,6 +2988,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"),
         .props     = AV_CODEC_PROP_TEXT_SUB,
     },
+    {
+        .id        = AV_CODEC_ID_ISDB_SUBTITLE,
+        .type      = AVMEDIA_TYPE_SUBTITLE,
+        .name      = "isdbsub",
+        .long_name = NULL_IF_CONFIG_SMALL("ISDB-S/T Text subtitle"),
+        .props     = AV_CODEC_PROP_TEXT_SUB,
+    },
 
     /* other kind of codecs and pseudo-codecs */
     {