Commit abcbbf63 authored by Laurent Aimar's avatar Laurent Aimar

* rtp: fix in mpeg 1/2 packetization.

parent e73ad00f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* rtp.c: rtp stream output module * rtp.c: rtp stream output module
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2004 VideoLAN * Copyright (C) 2003-2004 VideoLAN
* $Id: rtp.c,v 1.10 2004/01/30 16:45:40 fenrir Exp $ * $Id: rtp.c,v 1.11 2004/02/02 12:50:08 fenrir Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -582,7 +582,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -582,7 +582,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra ); id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
sprintf( id->psz_fmtp, sprintf( id->psz_fmtp,
"profile-level-id=3;config=%s", hexa ); "profile-level-id=3; config=%s", hexa );
} }
break; break;
} }
...@@ -598,9 +598,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -598,9 +598,9 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra ); id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
sprintf( id->psz_fmtp, sprintf( id->psz_fmtp,
"streamtype=5;profile-level-id=15;mode=AAC-hbr;" "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
"config=%s;SizeLength=13;IndexLength=3; " "config=%s; SizeLength=13;IndexLength=3; "
"IndexDeltaLength=3;Profile=1;", hexa ); "IndexDeltaLength=3; Profile=1;", hexa );
break; break;
} }
...@@ -913,8 +913,8 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -913,8 +913,8 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id,
if( i_rest > 4 && ( i_picture_coding_type == 2 || if( i_rest > 4 && ( i_picture_coding_type == 2 ||
i_picture_coding_type == 3 ) ) i_picture_coding_type == 3 ) )
{ {
i_ffc = (p[3] >> 2)&0x01; i_ffv = (p[3] >> 2)&0x01;
i_bfc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01); i_ffc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01);
if( i_picture_coding_type == 3 ) if( i_picture_coding_type == 3 )
{ {
i_fbv = (p[4]>>6)&0x01; i_fbv = (p[4]>>6)&0x01;
......
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