@ -4753,15 +4753,19 @@ static void start_rtp(struct skinny_subchannel *sub)
{
{
struct skinny_line * l = sub - > line ;
struct skinny_line * l = sub - > line ;
struct skinny_device * d = l - > device ;
struct skinny_device * d = l - > device ;
#if 0
int hasvideo = 0 ;
int hasvideo = 0 ;
# endif
struct ast_sockaddr bindaddr_tmp ;
struct ast_sockaddr bindaddr_tmp ;
skinny_locksub ( sub ) ;
skinny_locksub ( sub ) ;
SKINNY_DEBUG ( DEBUG_AUDIO , 3 , " Sub %u - Starting RTP \n " , sub - > callid ) ;
SKINNY_DEBUG ( DEBUG_AUDIO , 3 , " Sub %u - Starting RTP \n " , sub - > callid ) ;
ast_sockaddr_from_sin ( & bindaddr_tmp , & bindaddr ) ;
ast_sockaddr_from_sin ( & bindaddr_tmp , & bindaddr ) ;
sub - > rtp = ast_rtp_instance_new ( " asterisk " , sched , & bindaddr_tmp , NULL ) ;
sub - > rtp = ast_rtp_instance_new ( " asterisk " , sched , & bindaddr_tmp , NULL ) ;
#if 0
if ( hasvideo )
if ( hasvideo )
sub - > vrtp = ast_rtp_instance_new ( " asterisk " , sched , & bindaddr_tmp , NULL ) ;
sub - > vrtp = ast_rtp_instance_new ( " asterisk " , sched , & bindaddr_tmp , NULL ) ;
# endif
if ( sub - > rtp ) {
if ( sub - > rtp ) {
ast_rtp_instance_set_prop ( sub - > rtp , AST_RTP_PROPERTY_RTCP , 1 ) ;
ast_rtp_instance_set_prop ( sub - > rtp , AST_RTP_PROPERTY_RTCP , 1 ) ;
@ -4775,11 +4779,13 @@ static void start_rtp(struct skinny_subchannel *sub)
ast_channel_set_fd ( sub - > owner , 0 , ast_rtp_instance_fd ( sub - > rtp , 0 ) ) ;
ast_channel_set_fd ( sub - > owner , 0 , ast_rtp_instance_fd ( sub - > rtp , 0 ) ) ;
ast_channel_set_fd ( sub - > owner , 1 , ast_rtp_instance_fd ( sub - > rtp , 1 ) ) ;
ast_channel_set_fd ( sub - > owner , 1 , ast_rtp_instance_fd ( sub - > rtp , 1 ) ) ;
}
}
#if 0
if ( hasvideo & & sub - > vrtp & & sub - > owner ) {
if ( hasvideo & & sub - > vrtp & & sub - > owner ) {
ast_rtp_instance_set_channel_id ( sub - > vrtp , ast_channel_uniqueid ( sub - > owner ) ) ;
ast_rtp_instance_set_channel_id ( sub - > vrtp , ast_channel_uniqueid ( sub - > owner ) ) ;
ast_channel_set_fd ( sub - > owner , 2 , ast_rtp_instance_fd ( sub - > vrtp , 0 ) ) ;
ast_channel_set_fd ( sub - > owner , 2 , ast_rtp_instance_fd ( sub - > vrtp , 0 ) ) ;
ast_channel_set_fd ( sub - > owner , 3 , ast_rtp_instance_fd ( sub - > vrtp , 1 ) ) ;
ast_channel_set_fd ( sub - > owner , 3 , ast_rtp_instance_fd ( sub - > vrtp , 1 ) ) ;
}
}
# endif
if ( sub - > rtp ) {
if ( sub - > rtp ) {
ast_rtp_instance_set_qos ( sub - > rtp , qos . tos_audio , qos . cos_audio , " Skinny RTP " ) ;
ast_rtp_instance_set_qos ( sub - > rtp , qos . tos_audio , qos . cos_audio , " Skinny RTP " ) ;
ast_rtp_instance_set_prop ( sub - > rtp , AST_RTP_PROPERTY_NAT , l - > nat ) ;
ast_rtp_instance_set_prop ( sub - > rtp , AST_RTP_PROPERTY_NAT , l - > nat ) ;