add mp2v/mp1v to muxers

Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index e8b72d368e9620c6e629625d8503bb817e398dd2..156ecd1aaa9d75b5954d1a4e60f060eadb1c1abf 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -376,6 +376,8 @@ static int AddStream(sout_mux_t *p_mux, sout_input_t *p_input)
     case VLC_CODEC_MP4V:
     case VLC_CODEC_MPGA:
     case VLC_CODEC_MPGV:
+    case VLC_CODEC_MP2V:
+    case VLC_CODEC_MP1V:
     case VLC_CODEC_MJPG:
     case VLC_CODEC_MJPGB:
     case VLC_CODEC_SVQ1:
@@ -654,9 +656,13 @@ static bo_t *GetESDS(mp4_stream_t *p_stream)
     case VLC_CODEC_MP4V:
         i_object_type_indication = 0x20;
         break;
-    case VLC_CODEC_MPGV:
-        /* FIXME MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
-        i_object_type_indication = 0x60;
+    case VLC_CODEC_MP2V:
+        /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
+        i_object_type_indication = 0x65;
+        break;
+    case VLC_CODEC_MP1V:
+        /* MPEG-I=0x6b, MPEG-II = 0x60 -> 0x65 */
+        i_object_type_indication = 0x6b;
         break;
     case VLC_CODEC_MP4A:
         /* FIXME for mpeg2-aac == 0x66->0x68 */

diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index beb87da69abd128c623deaf051feb6f09715d71e..045096bd0d4a1aa88c22bc675d22f26af73e0d88 100644 (file)
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -110,7 +110,10 @@ static inline int PESHeader( uint8_t *p_hdr, mtime_t i_pts, mtime_t i_dts,
 
                 if( i_pts > 0 && i_dts > 0 &&
                     ( i_pts != i_dts || ( p_fmt->i_cat == VIDEO_ES &&
-                      p_fmt->i_codec != VLC_CODEC_MPGV ) ) )
+                      p_fmt->i_codec != VLC_CODEC_MPGV &&
+                      p_fmt->i_codec != VLC_CODEC_MP2V &&
+                      p_fmt->i_codec != VLC_CODEC_MP1V 
+                      ) ) )
                 {
                     i_pts_dts = 0x03;
                     if ( !i_header_size ) i_header_size = 0xa;

diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index cd36bd3fb10e81b4f82c0f6685c0a5fd6273af71..e00390b005d9fd76da6f5f03bd11d8218a136922 100644 (file)
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -273,6 +273,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     switch( p_input->p_fmt->i_codec )
     {
         case VLC_CODEC_MPGV:
+        case VLC_CODEC_MP2V:
+        case VLC_CODEC_MP1V:
             p_stream->i_stream_id =
                 StreamIdGet( p_sys->stream_id_mpgv, 0xe0, 0xef );
             p_stream->i_stream_type = 0x02; /* ISO/IEC 13818 Video */

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index dc8010cdc1b035ceb8ea1747c1d8b5e262c78471..e631e7e8f419b5639ad90c117732cdfc491eb289 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -895,6 +895,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     /* VIDEO */
 
     case VLC_CODEC_MPGV:
+    case VLC_CODEC_MP2V:
+    case VLC_CODEC_MP1V:
         /* TODO: do we need to check MPEG-I/II ? */
         p_stream->i_stream_type = 0x02;
         p_stream->i_stream_id = 0xe0;

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index f5f2eeadfb083428757b7ce7aeb1c034f273f221..d91418cee13807beb3b22af30e53618d7c874d3d 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -389,6 +389,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         {
         case VLC_CODEC_MP4V:
         case VLC_CODEC_MPGV:
+        case VLC_CODEC_MP1V:
+        case VLC_CODEC_MP2V:
         case VLC_CODEC_DIV3:
         case VLC_CODEC_MJPG:
         case VLC_CODEC_WMV1: