diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2015-03-12 10:39:24 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2015-03-12 10:39:43 +0000 |
| commit | cade82c56ffc53cf67039d9b48085a8b6bceade6 (patch) | |
| tree | b3d0fb1830096d094d30a826c3421d1ee07a8b0e /webrtc/modules/video_coding/main/source/media_optimization.cc | |
| parent | 119c12f6ef68aaa8cec735c26eab5784828d3d81 (diff) | |
| download | webrtc-cade82c56ffc53cf67039d9b48085a8b6bceade6.tar.gz | |
Refactor MediaOptimization protection methods.
Makes MediaOptimization::EnableProtectionMethod significantly less
confusing. Also removing some dead methods in VideoSender.
BUG=
R=mflodman@webrtc.org
TBR=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42339004
Cr-Commit-Position: refs/heads/master@{#8693}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8693 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/video_coding/main/source/media_optimization.cc')
| -rw-r--r-- | webrtc/modules/video_coding/main/source/media_optimization.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/main/source/media_optimization.cc index 1151d5b1f2..1f0eb5c662 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.cc +++ b/webrtc/modules/video_coding/main/source/media_optimization.cc @@ -321,15 +321,11 @@ uint32_t MediaOptimization::SetTargetRates( void MediaOptimization::EnableProtectionMethod(bool enable, VCMProtectionMethodEnum method) { CriticalSectionScoped lock(crit_sect_.get()); - bool updated = false; - if (enable) { - updated = loss_prot_logic_->SetMethod(method); - } else { - loss_prot_logic_->RemoveMethod(method); - } - if (updated) { - loss_prot_logic_->UpdateMethod(); - } + if (!enable && loss_prot_logic_->SelectedType() != method) + return; + if (!enable) + method = kNone; + loss_prot_logic_->SetMethod(method); } uint32_t MediaOptimization::InputFrameRate() { |