generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing two asserts which should have returned errors instead.

Browse Source 
BUG=

Review URL: https://webrtc-codereview.appspot.com/827007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2810 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2012-09-24 15:13:30 +00:00
parent 23fd559bcd
commit 2dcbcc147b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_engine/stream_synchronization.cc
View File

@ -41,10 +41,9 @@ bool CalculateFrequency(
int64_t rtcp_ntp_ms2, int64_t rtcp_ntp_ms2,
uint32_t rtp_timestamp2, uint32_t rtp_timestamp2,
double* frequency_khz) { double* frequency_khz) {
if (rtcp_ntp_ms1 == rtcp_ntp_ms2) { if (rtcp_ntp_ms1 <= rtcp_ntp_ms2) {
return false; return false;
} }
assert(rtcp_ntp_ms1 > rtcp_ntp_ms2);
*frequency_khz = static_cast<double>(rtp_timestamp1 - rtp_timestamp2) / *frequency_khz = static_cast<double>(rtp_timestamp1 - rtp_timestamp2) /
static_cast<double>(rtcp_ntp_ms1 - rtcp_ntp_ms2); static_cast<double>(rtcp_ntp_ms1 - rtcp_ntp_ms2);
return true; return true;
@ -107,7 +106,9 @@ bool RtpToNtpMs(int64_t rtp_timestamp,
} }
double rtp_timestamp_ntp_ms = (static_cast<double>(rtp_timestamp_unwrapped) - double rtp_timestamp_ntp_ms = (static_cast<double>(rtp_timestamp_unwrapped) -
offset) / freq_khz + 0.5f; offset) / freq_khz + 0.5f;
assert(rtp_timestamp_ntp_ms >= 0); if (rtp_timestamp_ntp_ms < 0) {
return false;
}
*rtp_timestamp_in_ms = rtp_timestamp_ntp_ms; *rtp_timestamp_in_ms = rtp_timestamp_ntp_ms;
return true; return true;
} }