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

video_coding: changing the UpdateMethod function (protection settings).

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/126002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@423 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2011-08-23 16:03:59 +00:00
parent 12f1fc4fe5
commit 06ad81fd58
2 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,42 +844,14 @@ VCMLossProtectionLogic::UpdateMethod(VCMProtectionMethod *newMethod /*=NULL */)
_currentParameters.codecWidth = _codecWidth; _currentParameters.codecWidth = _codecWidth;
_currentParameters.codecHeight = _codecHeight; _currentParameters.codecHeight = _codecHeight;
if (newMethod == NULL) // Update to new method, if not NULL
if (newMethod != NULL)
{ {
VCMProtectionMethod *method; _selectedMethod = newMethod;
ListItem *item; _selectedMethod->UpdateParameters(&_currentParameters);
for (item = _availableMethods.First(); item != NULL; return true;
item = _availableMethods.Next(item)) }
{ return false;
method = static_cast<VCMProtectionMethod *> (item->GetItem());
if (method != NULL)
{
if (method->Type() == kFEC)
{
_selectedMethod = method;
}
if (method->Type() == kNACK)
{
_selectedMethod = method;
}
if (method->Type() == kNackFec)
{
_selectedMethod = method;
}
method->UpdateParameters(&_currentParameters);
}
}
if (_selectedMethod != NULL && _selectedMethod->Type() != kFEC)
{
_selectedMethod = method;
}
}
else
{
_selectedMethod = newMethod;
_selectedMethod->UpdateParameters(&_currentParameters);
}
return true;
} }
VCMProtectionMethod* VCMProtectionMethod*

3
src/modules/video_coding/main/source/media_opt_util.h
View File

@ -339,8 +339,7 @@ public:
_fecRateDelta = fecRateDelta; } _fecRateDelta = fecRateDelta; }
// Update the protection methods with the current VCMProtectionParameters // Update the protection methods with the current VCMProtectionParameters
// and choose the best method available. The update involves computing the // and set the requested protection settings.
// robustness settings for the protection method.
// //
// Input: // Input:
// - newMethod : If not NULL, this method will be selected. // - newMethod : If not NULL, this method will be selected.