webrtc/modules/video_coding/main/source/media_opt_util.h - Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/main/source/media_opt_util.h

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/modules/video_coding/main/source/media_opt_util.h

diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.h b/webrtc/modules/video_coding/main/source/media_opt_util.h

index 498238768f6ebdda35aeb011e3e103ee461837e1..62d067ab3add62cad106c64e443deb44274faad2 100644

--- a/webrtc/modules/video_coding/main/source/media_opt_util.h

+++ b/webrtc/modules/video_coding/main/source/media_opt_util.h

@@ -15,6 +15,7 @@

#include <stdlib.h>

#include "webrtc/base/exp_filter.h"

+#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/video_coding/main/source/internal_defines.h"

#include "webrtc/modules/video_coding/main/source/qm_select.h"

#include "webrtc/system_wrappers/interface/trace.h"

@@ -335,7 +336,7 @@ private:

// Sets the available loss protection methods.

void UpdateMaxLossHistory(uint8_t lossPr255, int64_t now);

uint8_t MaxFilteredLossPr(int64_t nowMs) const;

- VCMProtectionMethod* _selectedMethod;

+ rtc::scoped_ptr<VCMProtectionMethod> _selectedMethod;

VCMProtectionParameters _currentParameters;

int64_t _rtt;

float _lossPr;