VideoFrameBuffer: Make non-const data access explicit

talk/media/webrtc/webrtcvideoframe.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 99 matching lines @@
 
 size_t WebRtcVideoFrame::GetWidth() const {
   return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
 }
 
 size_t WebRtcVideoFrame::GetHeight() const {
   return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
 }
 
 const uint8* WebRtcVideoFrame::GetYPlane() const {
-  // Const cast to call the correct const-version of data.
-  const webrtc::VideoFrameBuffer* const_ptr = video_frame_buffer_.get();
-  return const_ptr ? const_ptr->data(kYPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->data(kYPlane) : nullptr;
 }
 
 const uint8* WebRtcVideoFrame::GetUPlane() const {
-  // Const cast to call the correct const-version of data.
-  const webrtc::VideoFrameBuffer* const_ptr = video_frame_buffer_.get();
-  return const_ptr ? const_ptr->data(kUPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->data(kUPlane) : nullptr;
 }
 
 const uint8* WebRtcVideoFrame::GetVPlane() const {
-  // Const cast to call the correct const-version of data.
-  const webrtc::VideoFrameBuffer* const_ptr = video_frame_buffer_.get();
-  return const_ptr ? const_ptr->data(kVPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->data(kVPlane) : nullptr;
 }
 
 uint8* WebRtcVideoFrame::GetYPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->data(kYPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kYPlane)
+                             : nullptr;
 }
 
 uint8* WebRtcVideoFrame::GetUPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->data(kUPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kUPlane)
+                             : nullptr;
 }
 
 uint8* WebRtcVideoFrame::GetVPlane() {
-  return video_frame_buffer_ ? video_frame_buffer_->data(kVPlane) : nullptr;
+  return video_frame_buffer_ ? video_frame_buffer_->MutableData(kVPlane)
+                             : nullptr;
 }
 
 int32 WebRtcVideoFrame::GetYPitch() const {
   return video_frame_buffer_ ? video_frame_buffer_->stride(kYPlane) : 0;
 }
 
 int32 WebRtcVideoFrame::GetUPitch() const {
   return video_frame_buffer_ ? video_frame_buffer_->stride(kUPlane) : 0;
 }
 
@@ skipping 28 matching lines @@
     return true;
 
   // Not exclusive already, need to copy buffer.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> new_buffer =
       new rtc::RefCountedObject<webrtc::I420Buffer>(
           video_frame_buffer_->width(), video_frame_buffer_->height(),
           video_frame_buffer_->stride(kYPlane),
           video_frame_buffer_->stride(kUPlane),
           video_frame_buffer_->stride(kVPlane));
 
-  if (!CopyToPlanes(new_buffer->data(kYPlane), new_buffer->data(kUPlane),
-                    new_buffer->data(kVPlane), new_buffer->stride(kYPlane),
-                    new_buffer->stride(kUPlane), new_buffer->stride(kVPlane))) {
+  if (!CopyToPlanes(
+          new_buffer->MutableData(kYPlane), new_buffer->MutableData(kUPlane),
+          new_buffer->MutableData(kVPlane), new_buffer->stride(kYPlane),
+          new_buffer->stride(kUPlane), new_buffer->stride(kVPlane))) {
     return false;
   }
 
   video_frame_buffer_ = new_buffer;
   return true;
 }
 
 size_t WebRtcVideoFrame::ConvertToRgbBuffer(uint32 to_fourcc, uint8* buffer,
                                             size_t size, int stride_rgb) const {
   CHECK(video_frame_buffer_);
@@ skipping 119 matching lines @@
       rotated_frame_->GetUPlane(), rotated_frame_->GetUPitch(),
       rotated_frame_->GetVPlane(), rotated_frame_->GetVPitch(), width, height,
       static_cast<libyuv::RotationMode>(GetVideoRotation()));
   if (ret == 0) {
     return rotated_frame_.get();
   }
   return nullptr;
 }
 
 }  // namespace cricket