Commit 87cd07ca authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files

add mp2v/mp1v to muxers


Signed-off-by: Ilkka Ollakka's avatarIlkka Ollakka <ileoo@videolan.org>
parent cecf9be9
......@@ -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 */
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment