webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc - Issue 1371043003: Unify FrameType and VideoFrameType.

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 1371043003: Unify FrameType and VideoFrameType. (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/vp8/simulcast_encoder_adapter.h ('k') | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc » ('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 9ac2efabe624dc395d6d6ed5e351cd8e7d481d26..4439267cd2e5466d4a585c29c74ed86cf5fa5e9d 100644

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

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

@@ -233,7 +233,7 @@ int SimulcastEncoderAdapter::InitEncode(const VideoCodec* inst,

int SimulcastEncoderAdapter::Encode(

const VideoFrame& input_image,

const CodecSpecificInfo* codec_specific_info,

- const std::vector<VideoFrameType>* frame_types) {

+ const std::vector<FrameType>* frame_types) {

if (!Initialized()) {

return WEBRTC_VIDEO_CODEC_UNINITIALIZED;

}

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

if (!streaminfos_[stream_idx].send_stream)

continue;

- std::vector<VideoFrameType> stream_frame_types;

+ std::vector<FrameType> stream_frame_types;

if (send_key_frame) {

stream_frame_types.push_back(kKeyFrame);

streaminfos_[stream_idx].key_frame_request = false;