| Index: webrtc/media/engine/webrtcvideoframe.cc | 
| diff --git a/webrtc/media/engine/webrtcvideoframe.cc b/webrtc/media/engine/webrtcvideoframe.cc | 
| index b7d87a5bded645df9a5d6e233216e73de7ab21a3..f9175ee4b629d8dd44f4a633a2d84288711a8251 100644 | 
| --- a/webrtc/media/engine/webrtcvideoframe.cc | 
| +++ b/webrtc/media/engine/webrtcvideoframe.cc | 
| @@ -74,15 +74,15 @@ int WebRtcVideoFrame::height() const { | 
| } | 
|  | 
| const uint8_t* WebRtcVideoFrame::GetYPlane() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->data(kYPlane) : nullptr; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->DataY() : nullptr; | 
| } | 
|  | 
| const uint8_t* WebRtcVideoFrame::GetUPlane() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->data(kUPlane) : nullptr; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->DataU() : nullptr; | 
| } | 
|  | 
| const uint8_t* WebRtcVideoFrame::GetVPlane() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->data(kVPlane) : nullptr; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->DataV() : nullptr; | 
| } | 
|  | 
| uint8_t* WebRtcVideoFrame::GetYPlane() { | 
| @@ -101,15 +101,15 @@ uint8_t* WebRtcVideoFrame::GetVPlane() { | 
| } | 
|  | 
| int32_t WebRtcVideoFrame::GetYPitch() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->stride(kYPlane) : 0; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->StrideY() : 0; | 
| } | 
|  | 
| int32_t WebRtcVideoFrame::GetUPitch() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->stride(kUPlane) : 0; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->StrideU() : 0; | 
| } | 
|  | 
| int32_t WebRtcVideoFrame::GetVPitch() const { | 
| -  return video_frame_buffer_ ? video_frame_buffer_->stride(kVPlane) : 0; | 
| +  return video_frame_buffer_ ? video_frame_buffer_->StrideV() : 0; | 
| } | 
|  | 
| bool WebRtcVideoFrame::IsExclusive() const { | 
|  |