Changeset e2dc620701d7cf0583cd3390e9ee2b5655060f8d

Show
Ignore:
Timestamp:
01/03/06 14:36:01 (3 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1141220161 +0000
git-parent:

[3f416d3789d7601de902241e673d33703dd1a0df]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1141220161 +0000
Message:

* trackID changes for the VLC rtsp server as suggested by Leonardo ... <leonardo_c at libero dot it>.

  • apparently DSS is casesensitive on trackID.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/misc/rtsp.c

    r0918962 re2dc620  
    307307 
    308308    asprintf( &p_media->psz_rtsp_control_v4, 
    309                "a=control:rtsp://%%s:%d%s/trackid=%%d\r\n", 
     309               "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n", 
    310310               p_sys->i_port, p_media->psz_rtsp_path ); 
    311311    asprintf( &p_media->psz_rtsp_control_v6, 
    312                "a=control:rtsp://[%%s]:%d%s/trackid=%%d\r\n", 
     312               "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n", 
    313313              p_sys->i_port, p_media->psz_rtsp_path ); 
    314314 
    …… 
    387387 
    388388    /* TODO: update SDP, etc... */ 
    389     asprintf( &psz_urlc, "%s/trackid=%d", 
     389    asprintf( &psz_urlc, "%s/trackID=%d", 
    390390              p_media->psz_rtsp_path, p_media->i_es ); 
    391391    msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc ); 

  • modules/stream_out/rtp.c

    r9441759 re2dc620  
    793793        if( b_rtsp ) 
    794794        { 
    795             i_size += strlen( "a=control:*/trackid=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; 
     795            i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; 
    796796        } 
    797797    } 
    …… 
    863863        if( b_rtsp ) 
    864864        { 
    865             p += sprintf( p, "a=control:%s/trackid=%d\r\n", p_sys->psz_rtsp_control, i ); 
     865            p += sprintf( p, "a=control:trackID=%d\r\n", i ); 
    866866        } 
    867867    } 
    …… 
    11351135        char psz_urlc[strlen( p_sys->psz_rtsp_control ) + 1 + 10]; 
    11361136 
    1137         sprintf( psz_urlc, "%s/trackid=%d", p_sys->psz_rtsp_path, p_sys->i_es ); 
     1137        sprintf( psz_urlc, "%s/trackID=%d", p_sys->psz_rtsp_path, p_sys->i_es ); 
    11381138        msg_Dbg( p_stream, "rtsp: adding %s\n", psz_urlc ); 
    11391139        id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL, NULL );