webrtc/video/video_encoder.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/video/video_encoder.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:

Index: webrtc/video/video_encoder.cc

diff --git a/webrtc/video/video_encoder.cc b/webrtc/video/video_encoder.cc

index 305406b6c0fdbe5fc73bba684b4db53013e0a6b9..3e6ce634f8e9022442bab86e15250119e4639e35 100644

--- a/webrtc/video/video_encoder.cc

+++ b/webrtc/video/video_encoder.cc

@@ -99,7 +99,7 @@ int32_t VideoEncoderSoftwareFallbackWrapper::Release() {

int32_t VideoEncoderSoftwareFallbackWrapper::Encode(

const VideoFrame& frame,

const CodecSpecificInfo* codec_specific_info,

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

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

if (fallback_encoder_)

return fallback_encoder_->Encode(frame, codec_specific_info, frame_types);

return encoder_->Encode(frame, codec_specific_info, frame_types);

« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/video_encoder_unittest.cc » ('j') | no next file with comments »