Add VideoTrackSink interface to content/public

content/renderer/media/webrtc_videosink_adapter.h

Index: content/renderer/media/webrtc_videosink_adapter.h
diff --git a/content/renderer/media/webrtc_videosink_adapter.h b/content/renderer/media/webrtc_videosink_adapter.h
new file mode 100644
index 0000000000000000000000000000000000000000..cd3ea0be9d9321bf68e702306cf946dffd5e1fbc
--- /dev/null
+++ b/content/renderer/media/webrtc_videosink_adapter.h
@@ -0,0 +1,53 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_RENDERER_MEDIA_WEBRTC_VIDEOSINK_ADAPTER_H_

[no longer working on chromium, 2013/11/25 13:55:07]

videosink is not one word

[perkj_chrome, 2013/11/26 09:16:38]

Done.

+#define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEOSINK_ADAPTER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "content/common/content_export.h"
+#include "content/public/renderer/media/video_track_sink.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
+
+namespace base {
+class MessageLoopProxy;
+}
+
+namespace content {
+
+class CONTENT_EXPORT WebRtcVideoSinkAdapter

[Jói, 2013/11/25 15:50:57]

Needs documentation of role/responsibilities.

[perkj_chrome, 2013/11/26 09:16:38]

Done.

+    : NON_EXPORTED_BASE(public webrtc::VideoRendererInterface),
+      NON_EXPORTED_BASE(public webrtc::ObserverInterface),
+      public base::SupportsWeakPtr<WebRtcVideoSinkAdapter> {
+ public:
+  WebRtcVideoSinkAdapter(webrtc::VideoTrackInterface* video_track,
+                         VideoTrackSink* sink);
+  virtual ~WebRtcVideoSinkAdapter();
+
+  VideoTrackSink* sink() const { return sink_; }
+
+ protected:
+  // webrtc::VideoRendererInterface implementation. May be called on
+  // a different thread.
+  virtual void SetSize(int width, int height) OVERRIDE;
+  virtual void RenderFrame(const cricket::VideoFrame* frame) OVERRIDE;
+
+  // webrtc::ObserverInterface implementation.
+  virtual void OnChanged() OVERRIDE;
+
+ private:
+  void DoRenderFrameOnMainThread(scoped_refptr<media::VideoFrame> video_frame);
+
+  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+  VideoTrackSink* sink_;
+  // The video track the renderer is connected to.
+  scoped_refptr<webrtc::VideoTrackInterface> video_track_;

[no longer working on chromium, 2013/11/25 13:55:07]

curiously, the video track is owning an array of adapters, and the adapter is
keeping an reference of the track, isn't this circular reference?

[perkj_chrome, 2013/11/26 09:16:38]

This is the libjingle repressentation of a video track. 
The VideoTrack is not a libjingle track.

+  webrtc::MediaStreamTrackInterface::TrackState state_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebRtcVideoSinkAdapter);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_MEDIA_WEBRTC_VIDEOSINK_ADAPTER_H_