webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.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/h264/h264_video_toolbox_encoder.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_encoder_impl.cc ('k') | webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc

diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc

index 7d04f23958890903ae393956a2a1774721702b82..5f6a231288d9350a523205f88da2e0cc829fe2fa 100644

--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc

+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc

@@ -168,10 +168,14 @@ bool CopyVideoFrameToPixelBuffer(const webrtc::VideoFrame& frame,

int dst_stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);

// Convert I420 to NV12.

int ret = libyuv::I420ToNV12(

- frame.buffer(webrtc::kYPlane), frame.stride(webrtc::kYPlane),

- frame.buffer(webrtc::kUPlane), frame.stride(webrtc::kUPlane),

- frame.buffer(webrtc::kVPlane), frame.stride(webrtc::kVPlane), dst_y,

- dst_stride_y, dst_uv, dst_stride_uv, frame.width(), frame.height());

+ frame.video_frame_buffer()->DataY(),

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

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

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

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

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

+ dst_y, dst_stride_y, dst_uv, dst_stride_uv,

+ frame.width(), frame.height());

CVPixelBufferUnlockBaseAddress(pixel_buffer, 0);

if (ret) {

LOG(LS_ERROR) << "Error converting I420 VideoFrame to NV12 :" << ret;