Reland of Delete cricket::VideoFrame methods GetYPlane and GetYPitch.

webrtc/media/engine/webrtcvideoframe.cc

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 61 matching lines @@
 }
 
 int WebRtcVideoFrame::width() const {
   return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
 }
 
 int WebRtcVideoFrame::height() const {
   return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
 }
 
-const uint8_t* WebRtcVideoFrame::GetYPlane() const {
-  return video_frame_buffer_ ? video_frame_buffer_->DataY() : nullptr;
-}
-
-const uint8_t* WebRtcVideoFrame::GetUPlane() const {
-  return video_frame_buffer_ ? video_frame_buffer_->DataU() : nullptr;
-}
-
-const uint8_t* WebRtcVideoFrame::GetVPlane() const {
-  return video_frame_buffer_ ? video_frame_buffer_->DataV() : nullptr;
-}
-
-uint8_t* WebRtcVideoFrame::GetYPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kYPlane)
-                             : nullptr;
-}
-
-uint8_t* WebRtcVideoFrame::GetUPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kUPlane)
-                             : nullptr;
-}
-
-uint8_t* WebRtcVideoFrame::GetVPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kVPlane)
-                             : nullptr;
-}
-
-int32_t WebRtcVideoFrame::GetYPitch() const {
-  return video_frame_buffer_ ? video_frame_buffer_->StrideY() : 0;
-}
-
-int32_t WebRtcVideoFrame::GetUPitch() const {
-  return video_frame_buffer_ ? video_frame_buffer_->StrideU() : 0;
-}
-
-int32_t WebRtcVideoFrame::GetVPitch() const {
-  return video_frame_buffer_ ? video_frame_buffer_->StrideV() : 0;
-}
-
 bool WebRtcVideoFrame::IsExclusive() const {
   return video_frame_buffer_->IsMutable();
 }
 
 void* WebRtcVideoFrame::GetNativeHandle() const {
   return video_frame_buffer_ ? video_frame_buffer_->native_handle() : nullptr;
 }
 
-rtc::scoped_refptr<webrtc::VideoFrameBuffer>
+const rtc::scoped_refptr<webrtc::VideoFrameBuffer>&
 WebRtcVideoFrame::video_frame_buffer() const {
   return video_frame_buffer_;
 }
 
 VideoFrame* WebRtcVideoFrame::Copy() const {
   return new WebRtcVideoFrame(video_frame_buffer_, rotation_, timestamp_us_);
 }
 
 size_t WebRtcVideoFrame::ConvertToRgbBuffer(uint32_t to_fourcc,
                                             uint8_t* buffer,
@@ skipping 34 matching lines @@
   rotation_ = apply_rotation ? webrtc::kVideoRotation_0 : rotation;
 
   int horiz_crop = ((w - dw) / 2) & ~1;
   // ARGB on Windows has negative height.
   // The sample's layout in memory is normal, so just correct crop.
   int vert_crop = ((abs(h) - dh) / 2) & ~1;
   // Conversion functions expect negative height to flip the image.
   int idh = (h < 0) ? -dh : dh;
   int r = libyuv::ConvertToI420(
       sample, sample_size,
-      GetYPlane(), GetYPitch(),
-      GetUPlane(), GetUPitch(),
-      GetVPlane(), GetVPitch(),
+      video_frame_buffer_->MutableDataY(),
+      video_frame_buffer_->StrideY(),
+      video_frame_buffer_->MutableDataU(),
+      video_frame_buffer_->StrideU(),
+      video_frame_buffer_->MutableDataV(),
+      video_frame_buffer_->StrideV(),
       horiz_crop, vert_crop,
       w, h,
       dw, idh,
       static_cast<libyuv::RotationMode>(
           apply_rotation ? rotation : webrtc::kVideoRotation_0),
       format);
   if (r) {
     LOG(LS_ERROR) << "Error parsing format: " << GetFourccName(format)
                   << " return code : " << r;
     return false;
@@ skipping 48 matching lines @@
     rotated_width = orig_height;
     rotated_height = orig_width;
   }
 
   rotated_frame_.reset(
       CreateEmptyFrame(rotated_width, rotated_height, timestamp_us_));
 
   // TODO(guoweis): Add a function in webrtc_libyuv.cc to convert from
   // VideoRotation to libyuv::RotationMode.
   int ret = libyuv::I420Rotate(
-      GetYPlane(), GetYPitch(), GetUPlane(), GetUPitch(), GetVPlane(),
-      GetVPitch(), rotated_frame_->GetYPlane(), rotated_frame_->GetYPitch(),
-      rotated_frame_->GetUPlane(), rotated_frame_->GetUPitch(),
-      rotated_frame_->GetVPlane(), rotated_frame_->GetVPitch(),
+      video_frame_buffer_->DataY(), video_frame_buffer_->StrideY(),
+      video_frame_buffer_->DataU(), video_frame_buffer_->StrideU(),
+      video_frame_buffer_->DataV(), video_frame_buffer_->StrideV(),
+      rotated_frame_->video_frame_buffer()->MutableDataY(),
+      rotated_frame_->video_frame_buffer()->StrideY(),
+      rotated_frame_->video_frame_buffer()->MutableDataU(),
+      rotated_frame_->video_frame_buffer()->StrideU(),
+      rotated_frame_->video_frame_buffer()->MutableDataV(),
+      rotated_frame_->video_frame_buffer()->StrideV(),
       orig_width, orig_height,
       static_cast<libyuv::RotationMode>(rotation()));
   if (ret == 0) {
     return rotated_frame_.get();
   }
   return nullptr;
 }
 
 }  // namespace cricket