webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc - Issue 1963413004: Reland of Delete webrtc::VideoFrame methods buffer and stride.

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 1963413004: Reland of Delete webrtc::VideoFrame methods buffer and stride. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebase. 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

« no previous file with comments | « webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.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 cbd4ec16fda932f84363541babf160af08accd94..be55133dd6be5bcf65e11028e18673a640a5f571 100644

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

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

@@ -301,14 +301,21 @@ int SimulcastEncoderAdapter::Encode(

// Aligning stride values based on width.

dst_frame.CreateEmptyFrame(dst_width, dst_height, dst_width,

(dst_width + 1) / 2, (dst_width + 1) / 2);

- libyuv::I420Scale(

- input_image.buffer(kYPlane), input_image.stride(kYPlane),

- input_image.buffer(kUPlane), input_image.stride(kUPlane),

- input_image.buffer(kVPlane), input_image.stride(kVPlane), src_width,

- src_height, dst_frame.buffer(kYPlane), dst_frame.stride(kYPlane),

- dst_frame.buffer(kUPlane), dst_frame.stride(kUPlane),

- dst_frame.buffer(kVPlane), dst_frame.stride(kVPlane), dst_width,

- dst_height, libyuv::kFilterBilinear);

+ libyuv::I420Scale(input_image.video_frame_buffer()->DataY(),

+ input_image.video_frame_buffer()->StrideY(),

+ input_image.video_frame_buffer()->DataU(),

+ input_image.video_frame_buffer()->StrideU(),

+ input_image.video_frame_buffer()->DataV(),

+ input_image.video_frame_buffer()->StrideV(),

+ src_width, src_height,

+ dst_frame.video_frame_buffer()->MutableDataY(),

+ dst_frame.video_frame_buffer()->StrideY(),

+ dst_frame.video_frame_buffer()->MutableDataU(),

+ dst_frame.video_frame_buffer()->StrideU(),

+ dst_frame.video_frame_buffer()->MutableDataV(),

+ dst_frame.video_frame_buffer()->StrideV(),

+ dst_width, dst_height,

+ libyuv::kFilterBilinear);

dst_frame.set_timestamp(input_image.timestamp());

dst_frame.set_render_time_ms(input_image.render_time_ms());

streaminfos_[stream_idx].encoder->Encode(dst_frame, codec_specific_info,