Revert of Cleanup of webrtc::VideoFrame.

webrtc/common_video/incoming_video_stream.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 72 matching lines @@
     DeliverFrame(video_frame);
   } else {
     rtc::CritScope csB(&buffer_critsect_);
     if (render_buffers_->AddFrame(video_frame) == 1) {
       deliver_buffer_event_->Set();
     }
   }
   return 0;
 }
 
-void IncomingVideoStream::SetStartImage(const VideoFrame& video_frame) {
+int32_t IncomingVideoStream::SetStartImage(const VideoFrame& video_frame) {
   rtc::CritScope csS(&thread_critsect_);
-  start_image_.CopyFrame(video_frame);
+  return start_image_.CopyFrame(video_frame);
 }
 
-void IncomingVideoStream::SetTimeoutImage(const VideoFrame& video_frame,
-                                          const uint32_t timeout) {
+int32_t IncomingVideoStream::SetTimeoutImage(const VideoFrame& video_frame,
+                                             const uint32_t timeout) {
   rtc::CritScope csS(&thread_critsect_);
   timeout_time_ = timeout;
-  timeout_image_.CopyFrame(video_frame);
+  return timeout_image_.CopyFrame(video_frame);
 }
 
 void IncomingVideoStream::SetRenderCallback(
     VideoRenderCallback* render_callback) {
   rtc::CritScope cs(&thread_critsect_);
   render_callback_ = render_callback;
 }
 
 int32_t IncomingVideoStream::SetExpectedRenderDelay(
     int32_t delay_ms) {
@@ skipping 137 matching lines @@
     external_callback_->RenderFrame(stream_id_, video_frame);
   } else if (render_callback_) {
     render_callback_->RenderFrame(stream_id_, video_frame);
   }
 
   // We're done with this frame.
   last_render_time_ms_ = video_frame.render_time_ms();
 }
 
 }  // namespace webrtc