diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/RTP.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTP.cpp | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index 7118a24c14c..b29f5bfb890 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -34,15 +34,13 @@ // $Id$ -#include "orbsvcs/AV/RTP.h" -#include "orbsvcs/AV/RTCP.h" +#include "RTP.h" +#include "RTCP.h" #include "tao/debug.h" #include "ace/OS_NS_arpa_inet.h" #include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // RTP_Packet // Constructor for RTP packets received @@ -72,8 +70,8 @@ RTP_Packet::RTP_Packet(char* buffer, int length) else this->extension_bytes_ = 0; - this->packet_size_ = static_cast<ACE_UINT16> (length); - this->payload_size_ = static_cast<ACE_UINT16> (length-index); + this->packet_size_ = length; + this->payload_size_ = length-index; // This is necessary only for payload types that have 16 bit values to correct // the network byte ordering. @@ -139,7 +137,7 @@ RTP_Packet::RTP_Packet(unsigned char padding, this->packet_[index] = ((marker & 0x1) << 7 ) | ((payload_type & 0x7f)); index++; - *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(static_cast<u_short> (seq_num)); + *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(seq_num); index+=2; *((ACE_UINT32*)&this->packet_[index]) = (ACE_UINT32)htonl(timestamp); index+=4; @@ -258,7 +256,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info) frame_info->timestamp = this->ts(); frame_info->ssrc = this->ssrc(); frame_info->sequence_num = this->sn(); - frame_info->format = static_cast<CORBA::Octet> (this->pt()); + frame_info->format = this->pt(); } int @@ -294,7 +292,7 @@ void RTP_Packet::get_csrc_list (ACE_UINT32 **csrc_list, ACE_UINT16 &length) { *csrc_list = this->host_byte_order_csrc_list_; - length = static_cast<ACE_UINT16> (this->cc ()); + length = this->cc (); } void @@ -398,11 +396,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -454,11 +452,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -508,7 +506,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, if (frame_info->format != this->format_) ACE_DEBUG ((LM_DEBUG, "TAO_AV_RTP_Object::send_frame - error: format type mismatch")); - this->sequence_num_ = static_cast<ACE_UINT16> (frame_info->sequence_num); + this->sequence_num_ = frame_info->sequence_num; if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; @@ -521,11 +519,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -579,11 +577,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - static_cast<unsigned char> (this->format_), // payload type + this->format_, // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - static_cast<unsigned char> (csrc_count), // csrc count + csrc_count, // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -625,7 +623,7 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, control_object_ (0), connection_gone_ (0) { - this->sequence_num_ = static_cast<ACE_UINT16> (ACE_OS::rand ()); + this->sequence_num_ = ACE_OS::rand (); this->timestamp_offset_ = ACE_OS::rand (); char buf [BUFSIZ]; @@ -773,8 +771,6 @@ TAO_AV_RTP_Flow_Factory::control_flow_factory (void) return "RTCP"; } -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_RTP_Flow_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory, ACE_TEXT ("RTP_Flow_Factory"), |