webrtc/video/vie_encoder.h - Issue 1913073002: Extract common simulcast logic from VP8 wrapper and simulcast adapter

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/vie_encoder.h

Issue 1913073002: Extract common simulcast logic from VP8 wrapper and simulcast adapter (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Bug fix Created 4 years, 8 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/video_coding/utility/simulcast_state.cc ('K') | « webrtc/modules/video_coding/utility/video_coding_utility.gyp ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/video/vie_encoder.h

diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h

index 02fec6292a3c483b665160812d2b1ae77da63cf8..93962168fda651535674469cf3553345685b177b 100644

--- a/webrtc/video/vie_encoder.h

+++ b/webrtc/video/vie_encoder.h

@@ -37,6 +37,7 @@ class PayloadRouter;

class ProcessThread;

class QMVideoSettingsCallback;

class SendStatisticsProxy;

+class SimulcastState;

class ViEBitrateObserver;

class ViEEffectFilter;

class VideoCodingModule;

@@ -145,6 +146,7 @@ class ViEEncoder : public VideoEncoderRateObserver,

// padding.

int64_t time_of_last_frame_activity_ms_ GUARDED_BY(data_cs_);

VideoCodec encoder_config_ GUARDED_BY(data_cs_);

+ std::unique_ptr<SimulcastState> simulcast_rates_ GUARDED_BY(data_cs_);

pbos-webrtc 2016/04/29 21:23:27 stack alloc please

int min_transmit_bitrate_bps_ GUARDED_BY(data_cs_);

uint32_t last_observed_bitrate_bps_ GUARDED_BY(data_cs_);

bool network_is_transmitting_ GUARDED_BY(data_cs_);