[FFmpeg-cvslog] mpegts: add support for stream_type 0x42, which is CAVS

[Can Wu]

ffmpeg | branch: master | Can Wu <wu.canus at gmail.com> | Tue Feb 26 10:01:21 2013 +0800| [81cf53e13309bd58aeb10f3574807f66b25d0091] | committer: Anton Khirnov

mpegts: add support for stream_type 0x42, which is CAVS

This allows demuxing and muxing of CAVS TS streams.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81cf53e13309bd58aeb10f3574807f66b25d0091
---

 libavformat/mpeg.h      |    1 +
 libavformat/mpegts.c    |    1 +
 libavformat/mpegts.h    |    1 +
 libavformat/mpegtsenc.c |    3 +++
 4 files changed, 6 insertions(+)

diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index 75dddf3..629f2f0 100644
--- a/libavformat/mpeg.h
+++ b/libavformat/mpeg.h
@@ -54,6 +54,7 @@
 #define STREAM_TYPE_AUDIO_AAC       0x0f
 #define STREAM_TYPE_VIDEO_MPEG4     0x10
 #define STREAM_TYPE_VIDEO_H264      0x1b
+#define STREAM_TYPE_VIDEO_CAVS      0x42
 
 #define STREAM_TYPE_AUDIO_AC3       0x81
 #define STREAM_TYPE_AUDIO_DTS       0x8a
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 2582c5b..1540a8d 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -523,6 +523,7 @@ static const StreamType ISO_types[] = {
     { 0x10, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_MPEG4 },
     { 0x11, AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
     { 0x1b, AVMEDIA_TYPE_VIDEO,       AV_CODEC_ID_H264 },
+    { 0x42, AVMEDIA_TYPE_VIDEO,       AV_CODEC_ID_CAVS },
     { 0xd1, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_DIRAC },
     { 0xea, AVMEDIA_TYPE_VIDEO,        AV_CODEC_ID_VC1 },
     { 0 },
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 89544f0..fafe98f 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -52,6 +52,7 @@
 #define STREAM_TYPE_AUDIO_AAC_LATM  0x11
 #define STREAM_TYPE_VIDEO_MPEG4     0x10
 #define STREAM_TYPE_VIDEO_H264      0x1b
+#define STREAM_TYPE_VIDEO_CAVS      0x42
 #define STREAM_TYPE_VIDEO_VC1       0xea
 #define STREAM_TYPE_VIDEO_DIRAC     0xd1
 
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 29d83c6..44a5e5b 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -279,6 +279,9 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
         case AV_CODEC_ID_H264:
             stream_type = STREAM_TYPE_VIDEO_H264;
             break;
+        case AV_CODEC_ID_CAVS:
+            stream_type = STREAM_TYPE_VIDEO_CAVS;
+            break;
         case AV_CODEC_ID_DIRAC:
             stream_type = STREAM_TYPE_VIDEO_DIRAC;
             break;