webrtc/media/base/videocapturer.cc - Issue 1960073002: New method CreateScaledFrame in the VideoFrameFactory interface.

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/media/base/videocapturer.cc

Issue 1960073002: New method CreateScaledFrame in the VideoFrameFactory interface. Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix android compile. Created 4 years, 7 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/common_video/video_frame_buffer.cc ('K') | « webrtc/common_video/video_frame_buffer.cc ('k') | webrtc/media/base/videoframefactory.h » ('j') | webrtc/media/base/videoframefactory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/media/base/videocapturer.cc

diff --git a/webrtc/media/base/videocapturer.cc b/webrtc/media/base/videocapturer.cc

index b00cbfe8e320c3eeaad1bd4734bf0b8ecbed81ef..95c94b9bd28870be6eef6840563e97c58a5a090d 100644

--- a/webrtc/media/base/videocapturer.cc

+++ b/webrtc/media/base/videocapturer.cc

@@ -240,9 +240,8 @@ void VideoCapturer::OnFrameCaptured(VideoCapturer*,

// TODO(nisse): Reorganize frame factory methods, deleting crop

perkj_webrtc 2016/05/11 10:05:17 remove this todo?

nisse-webrtc 2016/05/12 12:23:06 Done.

// support there too.

- std::unique_ptr<VideoFrame> adapted_frame(frame_factory_->CreateAliasedFrame(

- captured_frame, captured_frame->width, captured_frame->height,

- adapted_width, adapted_height));

+ std::unique_ptr<VideoFrame> adapted_frame = frame_factory_->CreateScaledFrame(

+ captured_frame, adapted_width, adapted_height);

if (!adapted_frame) {

// TODO(fbarchard): LOG more information about captured frame attributes.