Revert of New rtc::VideoSinkInterface.

talk/media/base/capturemanager.cc

 /*
  * libjingle
  * Copyright 2012 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 12 matching lines @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "talk/media/base/capturemanager.h"
 
 #include <algorithm>
 
 #include "talk/media/base/videocapturer.h"
+#include "talk/media/base/videorenderer.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {
 
 // CaptureManager helper class.
 class VideoCapturerState {
  public:
   static const VideoFormatPod kDefaultCaptureFormat;
 
@@ skipping 236 matching lines @@
       // TODO(ryanpetrie): Support restart requests. Should this
       // to-be-implemented logic be used for {Start,Stop}VideoCapture as well?
       break;
     default:
       LOG(LS_ERROR) << "Unknown/unimplemented RestartOption";
       break;
   }
   return true;
 }
 
-void CaptureManager::AddVideoSink(VideoCapturer* video_capturer,
-                                  rtc::VideoSinkInterface<VideoFrame>* sink) {
+bool CaptureManager::AddVideoRenderer(VideoCapturer* video_capturer,
+                                      VideoRenderer* video_renderer) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  // TODO(nisse): Do we really need to tolerate NULL inputs?
-  if (!video_capturer || !sink) {
-    return;
+  if (!video_capturer || !video_renderer) {
+    return false;
   }
   CaptureRenderAdapter* adapter = GetAdapter(video_capturer);
   if (!adapter) {
-    return;
+    return false;
   }
-  adapter->AddSink(sink);
+  adapter->AddRenderer(video_renderer);
+  return true;
 }
 
-void CaptureManager::RemoveVideoSink(
-    VideoCapturer* video_capturer,
-    rtc::VideoSinkInterface<VideoFrame>* sink) {
+bool CaptureManager::RemoveVideoRenderer(VideoCapturer* video_capturer,
+                                         VideoRenderer* video_renderer) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  if (!video_capturer || !sink) {
-    return;
+  if (!video_capturer || !video_renderer) {
+    return false;
   }
   CaptureRenderAdapter* adapter = GetAdapter(video_capturer);
   if (!adapter) {
-    return;
+    return false;
   }
-  adapter->RemoveSink(sink);
+  adapter->RemoveRenderer(video_renderer);
+  return true;
 }
 
 bool CaptureManager::IsCapturerRegistered(VideoCapturer* video_capturer) const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return GetCaptureState(video_capturer) != NULL;
 }
 
 bool CaptureManager::RegisterVideoCapturer(VideoCapturer* video_capturer) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   VideoCapturerState* capture_state =
@@ skipping 72 matching lines @@
     VideoCapturer* video_capturer) const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   VideoCapturerState* capture_state = GetCaptureState(video_capturer);
   if (!capture_state) {
     return NULL;
   }
   return capture_state->adapter();
 }
 
 }  // namespace cricket