webrtc/video_engine/vie_channel_group.h - Issue 1329083005: Add TransportFeedback adapter, adapting remote feedback to bwe estiamtor

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/video_engine/vie_channel_group.h

Issue 1329083005: Add TransportFeedback adapter, adapting remote feedback to bwe estiamtor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Bad merge, test issue Created 5 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc ('K') | « webrtc/video_engine/vie_channel.cc ('k') | webrtc/video_engine/vie_channel_group.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/video_engine/vie_channel_group.h

diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h

index 3c8008fdb182e969842f54b2b58927b634f56faa..f1faa80cc6d93a93430005a4872a0beae9013e8b 100644

--- a/webrtc/video_engine/vie_channel_group.h

+++ b/webrtc/video_engine/vie_channel_group.h

@@ -22,7 +22,6 @@

namespace webrtc {

-class AdaptedSendTimeHistory;

class BitrateAllocator;

class CallStats;

class Config;

@@ -97,11 +96,10 @@ class ChannelGroup : public BitrateObserver {

EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_);

// Registered at construct time and assumed to outlive this class.

- ProcessThread* process_thread_;

+ ProcessThread* const process_thread_;

rtc::scoped_ptr<ProcessThread> pacer_thread_;

rtc::scoped_ptr<BitrateController> bitrate_controller_;

- rtc::scoped_ptr<AdaptedSendTimeHistory> send_time_history_;

};

} // namespace webrtc