Add VideoTrackSink interface to content/public

content/renderer/media/webrtc_video_sink_adapter.h

Index: content/renderer/media/webrtc_video_sink_adapter.h
diff --git a/content/renderer/media/webrtc_video_sink_adapter.h b/content/renderer/media/webrtc_video_sink_adapter.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b449f7a4e69705d34106c0fed33dafa61bb8b9b
--- /dev/null
+++ b/content/renderer/media/webrtc_video_sink_adapter.h
@@ -0,0 +1,60 @@
+// 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_VIDEO_SINK_ADAPTER_H_
+#define CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_SINK_ADAPTER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "content/common/content_export.h"
+#include "content/public/renderer/media_stream_video_sink.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
+
+namespace base {
+class MessageLoopProxy;
+}
+
+namespace content {
+
+// WebRtcVideoSinkAdapter acts as the middle man between a WebRtc
+// implementation of a MediaStream VideoTrack and a

[tommi (sloooow) - chröme, 2013/11/27 16:53:07]

MediaStreamVideoTrack? (no space)

[perkj_chrome, 2013/11/28 13:32:45]

Done.

+// content::MediaStreamVideoSink.
+// It is responsible for translating video data from the libjingle video types
+// to chrome video types.

[tommi (sloooow) - chröme, 2013/11/27 16:53:07]

Would it make sense to have the webrtc implementations (those that include from
libjingle), in a separate directory so that we can keep track of where those
includes are and even disallow them in other folders?

[Jói, 2013/11/27 18:35:51]

Good idea, we should do that.

[perkj_chrome, 2013/11/28 13:32:45]

Done. I keep the webrtc file name prefix here to mean webrtc -> content adapter
as opposed to content->webrtc adapter.

+class CONTENT_EXPORT WebRtcVideoSinkAdapter
+    : NON_EXPORTED_BASE(public webrtc::VideoRendererInterface),
+      NON_EXPORTED_BASE(public webrtc::ObserverInterface),
+      public base::SupportsWeakPtr<WebRtcVideoSinkAdapter> {
+ public:
+  WebRtcVideoSinkAdapter(webrtc::VideoTrackInterface* video_track,
+                         MediaStreamVideoSink* sink);
+  virtual ~WebRtcVideoSinkAdapter();
+
+  MediaStreamVideoSink* 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.
+  // TODO(perkj): OnChanged should be implemented on a common base class used
+  // for both WebRtc Audio and Video tracks.
+  virtual void OnChanged() OVERRIDE;
+
+ private:
+  void DoRenderFrameOnMainThread(scoped_refptr<media::VideoFrame> video_frame);
+
+  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+  MediaStreamVideoSink* sink_;
+  // The video track the renderer is connected to.
+  scoped_refptr<webrtc::VideoTrackInterface> video_track_;
+  webrtc::MediaStreamTrackInterface::TrackState state_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebRtcVideoSinkAdapter);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_MEDIA_WEBRTC_VIDEO_SINK_ADAPTER_H_