webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc - Issue 1415693002: Remove VideoFrameType aliases for FrameType.

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/codecs/vp8/simulcast_encoder_adapter.cc

Issue 1415693002: Remove VideoFrameType aliases for FrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: rebase Created 5 years, 2 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

« no previous file with comments | « webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc ('k') | webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc

diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc

index 4439267cd2e5466d4a585c29c74ed86cf5fa5e9d..5dc4ac78f179b6ed034fa856b827aa98101d179f 100644

--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc

+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc

@@ -246,7 +246,7 @@ int SimulcastEncoderAdapter::Encode(

bool send_key_frame = false;

if (frame_types) {

for (size_t i = 0; i < frame_types->size(); ++i) {

- if (frame_types->at(i) == kKeyFrame) {

+ if (frame_types->at(i) == kVideoFrameKey) {

send_key_frame = true;

break;

}

@@ -269,10 +269,10 @@ int SimulcastEncoderAdapter::Encode(

std::vector<FrameType> stream_frame_types;

if (send_key_frame) {

- stream_frame_types.push_back(kKeyFrame);

+ stream_frame_types.push_back(kVideoFrameKey);

streaminfos_[stream_idx].key_frame_request = false;

} else {

- stream_frame_types.push_back(kDeltaFrame);

+ stream_frame_types.push_back(kVideoFrameDelta);

}

int dst_width = streaminfos_[stream_idx].width;