diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-24 15:11:25 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-24 15:11:25 +0000 |
| commit | 2543c99d508c70cdcd9a90f59ad070c27891e262 (patch) | |
| tree | 816ae1a2c3082045d6ecd376bdd3c3cb259d71a4 | |
| parent | 2306d83ee9f56323714e5333f12f482d9be7ee87 (diff) | |
| download | ATCD-2543c99d508c70cdcd9a90f59ad070c27891e262.tar.gz | |
ChangeLogTag: Fri Sep 24 10:08:50 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTP.cpp | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d4524a17734..11a3a9ac359 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 24 10:08:50 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * orbsvcs/orbsvcs/AV/RTP.cpp: + + Added statc_cast<> to the last argument passed to the + RTP_Packet constructor, to avoid loss-of-data warnings + on MSVC 7.1. + Fri Sep 24 09:38:16 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/CORBALOC_Parser.cpp: diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index 37b86fa9478..eeb27381690 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -517,7 +517,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, // set the ssrc on the control object so the RTCP traffic can be matched // to the RTP traffic rtcp_prot_obj->ssrc(this->ssrc_); - + ACE_UINT16 data_size = static_cast<ACE_UINT16> (iov[0].iov_len); ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding @@ -528,8 +528,8 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, this->ssrc_, // ssrc csrc_count, // csrc count csrc_list, // csrc list - (char *)iov[0].iov_base, // data - iov[0].iov_len), // data size + (char *)iov[0].iov_base, // data + data_size), // data size -1); frame_info->sequence_num ++; @@ -575,6 +575,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, (now.sec () * samples_per_sec + ((double)now.usec () * samples_per_usec) + this->timestamp_offset_); + ACE_UINT16 data_size = static_cast<ACE_UINT16> (iov[0].iov_len); ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding @@ -585,8 +586,8 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, this->ssrc_, // ssrc csrc_count, // csrc count csrc_list, // csrc list - (char *)iov[0].iov_base, // data - iov[0].iov_len), // data size + (char *)iov[0].iov_base, // data + data_size), // data size -1); this->sequence_num_ ++; |