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

video_coding robustness: Updating hybrid mode's settings

Browse Source 
1. Disabling adjustment factor - temporary update. 
2. Enabling a windowed filtered loss for the hybrid mode.  
Review URL: http://webrtc-codereview.appspot.com/192003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@684 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2011-10-03 22:54:34 +00:00
parent 1b6ff7adbe
commit ae7a0522c5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/video_coding/main/source/media_opt_util.cc
View File

@@ -81,8 +81,9 @@ VCMNackFecMethod::ProtectionFactor(const
// RTT (NACK effectiveness) - adjustment factor is in the range [0,1]. // RTT (NACK effectiveness) - adjustment factor is in the range [0,1].
if (parameters->rtt < kHighRttNackMs) if (parameters->rtt < kHighRttNackMs)
{ {
WebRtc_UWord16 rttIndex = (WebRtc_UWord16) parameters->rtt; // TODO(mikhal): Disabling adjustment temporarily.
float adjustRtt = (float)VCMNackFecTable[rttIndex] / 100.0f; // WebRtc_UWord16 rttIndex = (WebRtc_UWord16) parameters->rtt;
float adjustRtt = 1.0f;// (float)VCMNackFecTable[rttIndex] / 100.0f;
// Adjust FEC with NACK on (for delta frame only) // Adjust FEC with NACK on (for delta frame only)
// table depends on RTT relative to rttMax (NACK Threshold) // table depends on RTT relative to rttMax (NACK Threshold)
@@ -724,17 +725,16 @@ VCMLossProtectionLogic::MaxFilteredLossPr(WebRtc_Word64 nowMs) const
WebRtc_UWord8 WebRtc_UWord8
VCMLossProtectionLogic::FilteredLoss() const VCMLossProtectionLogic::FilteredLoss() const
{ {
//take the average received loss if (_selectedMethod != NULL &&
//return static_cast<WebRtc_UWord8>(_lossPr255.Value() + 0.5f); (_selectedMethod->Type() == kFec ||
_selectedMethod->Type() == kNackFec))
//TODO: Update for hybrid
//take the windowed max of the received loss
if (_selectedMethod != NULL && _selectedMethod->Type() == kFec)
{ {
// Take the windowed max of the received loss.
return MaxFilteredLossPr(VCMTickTime::MillisecondTimestamp()); return MaxFilteredLossPr(VCMTickTime::MillisecondTimestamp());
} }
else else
{ {
// Take the average received loss.
return static_cast<WebRtc_UWord8> (_lossPr255.Value() + 0.5); return static_cast<WebRtc_UWord8> (_lossPr255.Value() + 0.5);
} }
} }