VideoFrameBuffer: Make non-const data access explicit

webrtc/common_video/video_frame.cc

 /*
  *  Copyright (c) 2012 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 134 matching lines @@
 
 void VideoFrame::Reset() {
   video_frame_buffer_ = nullptr;
   timestamp_ = 0;
   ntp_time_ms_ = 0;
   render_time_ms_ = 0;
   rotation_ = kVideoRotation_0;
 }
 
 uint8_t* VideoFrame::buffer(PlaneType type) {
+  return video_frame_buffer_ ? video_frame_buffer_->MutableData(type)
+                             : nullptr;
+}
+
+const uint8_t* VideoFrame::buffer(PlaneType type) const {
   return video_frame_buffer_ ? video_frame_buffer_->data(type) : nullptr;
 }
 
-const uint8_t* VideoFrame::buffer(PlaneType type) const {
-  // Const cast to call the correct const-version of data.
-  const VideoFrameBuffer* const_buffer = video_frame_buffer_.get();
-  return const_buffer ? const_buffer->data(type) : nullptr;
-}
-
 int VideoFrame::allocated_size(PlaneType type) const {
   const int plane_height = (type == kYPlane) ? height() : (height() + 1) / 2;
   return plane_height * stride(type);
 }
 
 int VideoFrame::stride(PlaneType type) const {
   return video_frame_buffer_ ? video_frame_buffer_->stride(type) : 0;
 }
 
 int VideoFrame::width() const {
@@ skipping 23 matching lines @@
 
 VideoFrame VideoFrame::ConvertNativeToI420Frame() const {
   DCHECK(native_handle());
   VideoFrame frame;
   frame.ShallowCopy(*this);
   frame.set_video_frame_buffer(video_frame_buffer_->NativeToI420Buffer());
   return frame;
 }
 
 }  // namespace webrtc