Changeset ce0c33fa7e18517ad1cbe0739e8327c75bc23252

Show
Ignore:
Timestamp:
08/19/07 16:17:26 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1187533046 +0000
git-parent:

[e7815d90f179d6ea37a934845cab612d784825fe]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1187533046 +0000
Message:

- Rename rtcp option to rtcp-port
- Add rtcp boolean to emit RTCP SR

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access_output/udp.c

    r39c6252 rce0c33f  
    103103                       "without trying to make the biggest possible packets " \ 
    104104                       "in order to improve streaming)." ) 
    105 #define RTCP_TEXT N_("RTCP destination port number") 
    106 #define RTCP_LONGTEXT N_("Sends RTCP packets to this port (0 = auto)") 
     105#define RTCP_TEXT N_("RTCP Sender Report") 
     106#define RTCP_LONGTEXT N_("Send RTCP Sender Report packets") 
     107#define RTCP_PORT_TEXT N_("RTCP destination port number") 
     108#define RTCP_PORT_LONGTEXT N_("Sends RTCP packets to this port (0 = auto)") 
    107109#define AUTO_MCAST_TEXT N_("Automatic multicast streaming") 
    108110#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \ 
    …… 
    124126    add_bool( SOUT_CFG_PREFIX "raw",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, 
    125127                                 VLC_TRUE ); 
    126     add_integer( SOUT_CFG_PREFIX "rtcp",  0, NULL, RTCP_TEXT, RTCP_LONGTEXT, 
    127                  VLC_TRUE ); 
     128    add_bool( SOUT_CFG_PREFIX "rtcp",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, 
     129                                 VLC_TRUE ); 
     130    add_integer( SOUT_CFG_PREFIX "rtcp-port",  0, NULL, RTCP_PORT_TEXT, 
     131                 RTCP_PORT_LONGTEXT, VLC_TRUE ); 
    128132    add_bool( SOUT_CFG_PREFIX "auto-mcast", VLC_FALSE, NULL, AUTO_MCAST_TEXT, 
    129133              AUTO_MCAST_LONGTEXT, VLC_TRUE ); 
    …… 
    147151    "raw", 
    148152    "rtcp", 
     153    "rtcp-port", 
    149154    "lite", 
    150155    "cscov", 
    …… 
    228233    int                 i_handle; 
    229234 
    230     vlc_value_t         val; 
    231  
    232235    config_ChainParse( p_access, SOUT_CFG_PREFIX, 
    233236                       ppsz_sout_options, p_access->p_cfg ); 
    …… 
    284287    } 
    285288 
    286     /* This option is really only meant for the RTP streaming output 
    287      * plugin. Doing RTCP for raw UDP will yield weird results. */ 
    288     i_rtcp_port = var_GetInteger (p_access, SOUT_CFG_PREFIX"rtcp"); 
    289     /* If RTCP port is not specified, use the default, if we do RTP/MP2 encap, 
    290      * or do not use RTCP at all otherwise. */ 
    291     if ((i_rtcp_port == 0) && (p_sys->b_rtpts)) 
    292         i_rtcp_port = i_dst_port + 1; 
     289    if (var_GetBool (p_access, SOUT_CFG_PREFIX"rtcp")) 
     290    { 
     291        /* This is really only for the RTP sout plugin. 
     292         * Doing RTCP for non RTP packet is NOT a good idea. */ 
     293        i_rtcp_port = var_GetInteger (p_access, SOUT_CFG_PREFIX"rtcp-port"); 
     294        if (i_rtcp_port == 0) 
     295            i_rtcp_port = i_dst_port + 1; 
     296    } 
    293297 
    294298    p_sys->p_thread = 
    …… 
    399403    } 
    400404 
    401     var_Get( p_access, SOUT_CFG_PREFIX "raw", &val ); 
    402     if( val.b_bool )  p_access->pf_write = WriteRaw; 
    403     else p_access->pf_write = Write; 
     405    if (var_GetBool (p_accesss, SOUT_CFG_PREFIX"raw")) 
     406        p_access->pf_write = WriteRaw; 
     407    else 
     408        p_access->pf_write = Write; 
    404409 
    405410    p_access->pf_seek = Seek;