summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLimin Wang <lance.lmwang@gmail.com>2021-08-24 18:39:13 +0800
committerLimin Wang <lance.lmwang@gmail.com>2021-10-20 22:40:13 +0800
commit5779bd5b2a9281b443a41aebad1be0b1def965ef (patch)
tree8232c548edd7c9d0324ef9c12139746d60a4db8d
parent960efa94ff817d3c0761ce7414ddd632cfe7ed74 (diff)
downloadffmpeg-5779bd5b2a9281b443a41aebad1be0b1def965ef.tar.gz
avformat/mpegts: add support for stream_type 0xd4, which is AVS3
GB/T 17975.1 Information technology-Generic coding of moving pictures and associated audio information-Part 1:Systems Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
-rw-r--r--libavformat/mpegts.c1
-rw-r--r--libavformat/mpegts.h1
-rw-r--r--libavformat/mpegtsenc.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 44d9298b12..d8cbaa8ced 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -807,6 +807,7 @@ static const StreamType ISO_types[] = {
{ 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS },
{ 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
{ 0xd2, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS2 },
+ { 0xd4, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_AVS3 },
{ 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
{ 0 },
};
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 910d65af8c..a48f14e768 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -130,6 +130,7 @@
#define STREAM_TYPE_VIDEO_HEVC 0x24
#define STREAM_TYPE_VIDEO_CAVS 0x42
#define STREAM_TYPE_VIDEO_AVS2 0xd2
+#define STREAM_TYPE_VIDEO_AVS3 0xd4
#define STREAM_TYPE_VIDEO_VC1 0xea
#define STREAM_TYPE_VIDEO_DIRAC 0xd1
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index f3b7914175..26fb1f1841 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -369,6 +369,9 @@ static int get_dvb_stream_type(AVFormatContext *s, AVStream *st)
case AV_CODEC_ID_AVS2:
stream_type = STREAM_TYPE_VIDEO_AVS2;
break;
+ case AV_CODEC_ID_AVS3:
+ stream_type = STREAM_TYPE_VIDEO_AVS3;
+ break;
case AV_CODEC_ID_DIRAC:
stream_type = STREAM_TYPE_VIDEO_DIRAC;
break;