Changeset eec78961e6d670e6c108aa3f45c8a7bba3764129

Show
Ignore:
Timestamp:
09/08/07 11:50:01 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1189245001 +0000
git-parent:

[a2bfd50577abf06b4d9d4895d3665e08418efc6e]

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

access_out_udp: remove "raw" mode that is not used anymore
(it was only used internally by the RTP sout).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access_output/udp.c

    r68cdf34 reec7896  
    9696                          "helps reducing the scheduling load on " \ 
    9797                          "heavily-loaded systems." ) 
    98 #define RAW_TEXT N_("Raw write") 
    99 #define RAW_LONGTEXT N_("Packets will be sent " \ 
    100                        "directly, without trying to fill the MTU (ie, " \ 
    101                        "without trying to make the biggest possible packets " \ 
    102                        "in order to improve streaming)." ) 
    10398#define RTCP_TEXT N_("RTCP Sender Report") 
    10499#define RTCP_LONGTEXT N_("Send RTCP Sender Report packets") 
    …… 
    122117                                 VLC_TRUE ); 
    123118    add_obsolete_integer( SOUT_CFG_PREFIX "late" ); 
    124     add_bool( SOUT_CFG_PREFIX "raw",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, 
    125                                  VLC_TRUE ); 
    126     add_bool( SOUT_CFG_PREFIX "rtcp",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT, 
     119    add_obsolete_bool( SOUT_CFG_PREFIX "raw" ); 
     120    add_bool( SOUT_CFG_PREFIX "rtcp",  VLC_FALSE, NULL, RTCP_TEXT, RTCP_LONGTEXT, 
    127121                                 VLC_TRUE ); 
    128122    add_integer( SOUT_CFG_PREFIX "rtcp-port",  0, NULL, RTCP_PORT_TEXT, 
    …… 
    146140    "caching", 
    147141    "group", 
    148     "raw", 
    149142    "rtcp", 
    150143    "rtcp-port", 
    …… 
    164157 
    165158static int  Write   ( sout_access_out_t *, block_t * ); 
    166 static int  WriteRaw( sout_access_out_t *, block_t * ); 
    167159static int  Seek    ( sout_access_out_t *, off_t  ); 
    168160 
    …… 
    393385    } 
    394386 
    395     if (var_GetBool (p_access, SOUT_CFG_PREFIX"raw")) 
    396         p_access->pf_write = WriteRaw; 
    397     else 
    398         p_access->pf_write = Write; 
    399  
     387    p_access->pf_write = Write; 
    400388    p_access->pf_seek = Seek; 
    401389 
    …… 
    525513        p_buffer = p_next; 
    526514    } 
    527  
    528     return( p_sys->p_thread->b_error ? -1 : i_len ); 
    529 } 
    530  
    531 /***************************************************************************** 
    532  * WriteRaw: write p_buffer without trying to fill mtu 
    533  *****************************************************************************/ 
    534 static int WriteRaw( sout_access_out_t *p_access, block_t *p_buffer ) 
    535 { 
    536     sout_access_out_sys_t   *p_sys = p_access->p_sys; 
    537     block_t *p_buf; 
    538     int i_len; 
    539  
    540     while ( p_sys->p_thread->p_empty_blocks->i_depth >= MAX_EMPTY_BLOCKS ) 
    541     { 
    542         p_buf = block_FifoGet(p_sys->p_thread->p_empty_blocks); 
    543         block_Release( p_buf ); 
    544     } 
    545  
    546     i_len = p_buffer->i_buffer; 
    547     block_FifoPut( p_sys->p_thread->p_fifo, p_buffer ); 
    548515 
    549516    return( p_sys->p_thread->b_error ? -1 : i_len );