Revert of Cleanup of webrtc::VideoFrame.

webrtc/common_video/include/incoming_video_stream.h

 /*
  *  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 38 matching lines @@
   int32_t Start();
   int32_t Stop();
 
   // Clear all buffers.
   int32_t Reset();
 
   // Properties.
   uint32_t StreamId() const;
   uint32_t IncomingRate() const;
 
-  void SetStartImage(const VideoFrame& video_frame);
+  int32_t SetStartImage(const VideoFrame& video_frame);
 
-  void SetTimeoutImage(const VideoFrame& video_frame,
-                       const uint32_t timeout);
+  int32_t SetTimeoutImage(const VideoFrame& video_frame,
+                          const uint32_t timeout);
 
   int32_t SetExpectedRenderDelay(int32_t delay_ms);
 
  protected:
   static bool IncomingVideoStreamThreadFun(void* obj);
   bool IncomingVideoStreamProcess();
 
  private:
   enum { kEventStartupTimeMs = 10 };
   enum { kEventMaxWaitTimeMs = 100 };
@@ skipping 25 matching lines @@
   int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
   VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
   VideoFrame start_image_ GUARDED_BY(thread_critsect_);
   VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
   uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_