Changeset 8da8aa9818c5f129db745331bf2b87f173eaf0c0

Timestamp:

04/10/07 19:46:20 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1191519980 +0000

git-parent:

[5d33b82e889d2d8c3d9f040eaa0d6a6e51d270b0]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1191519980 +0000

Message:

Factorize rtpmap formatting

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (13 diffs)
• src/stream_output/sdp.c (modified) (2 diffs)

include/vlc_sout.h

@@ -220 +220 @@
-
-VLC_EXPORT( char *, vlc_sdp_Start, ( vlc_object_t *obj, const char *cfgpref, const struct sockaddr *src, size_t srclen, const struct sockaddr *addr, size_t addrlen ) );
-rtpmap
+ptname, unsigned clockrate, unsigned channels
-VLC_EXPORT( char *, sdp_AddAttribute, (char **sdp, const char *name, const char *fmt, ...) ATTRIBUTE_FORMAT( 3, 4 ) );
-

modules/stream_out/rtp.c

@@ -283 +283 @@
-
-    /* for sdp */
-har        *psz_rtpmap
+onst char  *psz_enc
-    char        *psz_fmtp;
-    int          i_clock_rate;
@@ -744 +744 @@
-        sdp_AddMedia( &psz_sdp, mime_major, proto, inclport * id->i_port,
-                      id->i_payload_type, VLC_FALSE, id->i_bitrate,
-
+
+
-
-        if( rtsp_url != NULL )
@@ -853 +854 @@
-    id->ssrc[3] = rand()&0xff;
-
-rtpmap
+enc   
-    id->psz_fmtp   = NULL;
-    id->i_clock_rate = 90000; /* most common case for video */
@@ -930 +931 @@
-        {
-            id->i_payload_type = 33;
-rtpmap = strdup( "MP2T/90000" )
+enc = "MP2T"
-        }
-        else
-        {
-rtpmap = strdup( "MP2P/90000" )
+enc = "MP2P"
-        }
-    }
@@ -943 +944 @@
-            if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
-                id->i_payload_type = 0;
-
-
-
+
-            id->pf_packetize = rtp_packetize_l8;
-            break;
@@ -951 +950 @@
-            if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
-                id->i_payload_type = 8;
-
-
-
+
-            id->pf_packetize = rtp_packetize_l8;
-            break;
@@ -966 +963 @@
-                id->i_payload_type = 10;
-            }
-
-
-
+
-            id->pf_packetize = rtp_packetize_l16;
-            break;
-        case VLC_FOURCC( 'u', '8', ' ', ' ' ):
-
-
-
+
-            id->pf_packetize = rtp_packetize_l8;
-            break;
-        case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
-            id->i_payload_type = 14;
-rtpmap = strdup( "MPA/90000" )
+enc = "MPA"
-            id->pf_packetize = rtp_packetize_mpa;
-            break;
-        case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
-            id->i_payload_type = 32;
-rtpmap = strdup( "MPV/90000" )
+enc = "MPV"
-            id->pf_packetize = rtp_packetize_mpv;
-            break;
-        case VLC_FOURCC( 'a', '5', '2', ' ' ):
-rtpmap = strdup( "ac3/90000" )
+enc = "ac3"
-            id->pf_packetize = rtp_packetize_ac3;
-            break;
-        case VLC_FOURCC( 'H', '2', '6', '3' ):
-rtpmap = strdup( "H263-1998/90000" )
+enc = "H263-1998"
-            id->pf_packetize = rtp_packetize_h263;
-            break;
-        case VLC_FOURCC( 'h', '2', '6', '4' ):
-rtpmap = strdup( "H264/90000" )
+enc = "H264"
-            id->pf_packetize = rtp_packetize_h264;
-            id->psz_fmtp = NULL;
@@ -1058 +1051 @@
-            char hexa[2*p_fmt->i_extra +1];
-
-rtpmap = strdup( "MP4V-ES/90000" )
+enc = "MP4V-ES"
-            id->pf_packetize = rtp_packetize_split;
-            if( p_fmt->i_extra > 0 )
@@ -1075 +1068 @@
-                char hexa[2*p_fmt->i_extra +1];
-
-
-
-
+
-                id->pf_packetize = rtp_packetize_mp4a;
-                sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
@@ -1107 +1098 @@
-                config[5]=0xc0;
-
-
-
-
-
+
-                id->pf_packetize = rtp_packetize_mp4a_latm;
-                sprintf_hexa( hexa, config, 6 );
@@ -1120 +1108 @@
-        }
-        case VLC_FOURCC( 's', 'a', 'm', 'r' ):
-
-
+
-            id->psz_fmtp = strdup( "octet-align=1" );
-            id->pf_packetize = rtp_packetize_amr;
-            break;
-        case VLC_FOURCC( 's', 'a', 'w', 'b' ):
-
-
+
-            id->psz_fmtp = strdup( "octet-align=1" );
-            id->pf_packetize = rtp_packetize_amr;
@@ -1133 +1119 @@
-        case VLC_FOURCC( 's', 'p', 'x', ' ' ):
-            id->i_payload_type = p_sys->i_payload_type++;
-
-
-
+
-            id->pf_packetize = rtp_packetize_spx;
-            break;
-        case VLC_FOURCC( 't', '1', '4', '0' ):
-rtpmap = strdup( "t140/1000" )
+enc = "t140" 
-            id->i_clock_rate = 1000;
-            id->pf_packetize = rtp_packetize_t140;
@@ -1219 +1203 @@
-    }
-
-    free( id->psz_rtpmap );
-    free( id->psz_fmtp );
-

src/stream_output/sdp.c

@@ -206 +206 @@
-                    const char *type, const char *protocol, int dport,
-                    unsigned pt, vlc_bool_t bw_indep, unsigned bw,
-
+
+
-{
-    char *newsdp, *ptr;
@@ -238 +239 @@
-
-    /* RTP payload type map */
-
-
+
+
+
+
+
+
+
+
-    /* Format parameters */
-    if (fmtp != NULL)