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

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

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

index 3eeb6525542f8edb36bc125461aa26018b6c7352..4d85858a1621aa211eddd4b074365d893f0e58f4 100644

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

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

@@ -367,12 +367,12 @@ int32_t H264EncoderImpl::Encode(

picture.iPicHeight = frame.height();

picture.iColorFormat = EVideoFormatType::videoFormatI420;

picture.uiTimeStamp = frame.ntp_time_ms();

- picture.iStride[0] = frame.stride(kYPlane);

- picture.iStride[1] = frame.stride(kUPlane);

- picture.iStride[2] = frame.stride(kVPlane);

- picture.pData[0] = const_cast<uint8_t*>(frame.buffer(kYPlane));

- picture.pData[1] = const_cast<uint8_t*>(frame.buffer(kUPlane));

- picture.pData[2] = const_cast<uint8_t*>(frame.buffer(kVPlane));

+ picture.iStride[0] = frame.video_frame_buffer()->StrideY();

+ picture.iStride[1] = frame.video_frame_buffer()->StrideU();

+ picture.iStride[2] = frame.video_frame_buffer()->StrideV();

+ picture.pData[0] = const_cast<uint8_t*>(frame.video_frame_buffer()->DataY());

+ picture.pData[1] = const_cast<uint8_t*>(frame.video_frame_buffer()->DataU());

+ picture.pData[2] = const_cast<uint8_t*>(frame.video_frame_buffer()->DataV());

// EncodeFrame output.

SFrameBSInfo info;