Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(838)

Unified Diff: content/renderer/media/webrtc/webrtc_video_sink_adapter.h

Issue 201583003: Implement a source for remote video tracks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/webrtc_video_sink_adapter.h
diff --git a/content/renderer/media/webrtc/webrtc_video_sink_adapter.h b/content/renderer/media/webrtc/webrtc_video_sink_adapter.h
deleted file mode 100644
index 2f75a95ef359d2746a111082950298db7af79a38..0000000000000000000000000000000000000000
--- a/content/renderer/media/webrtc/webrtc_video_sink_adapter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 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_WEBRTC_VIDEO_SINK_ADAPTER_H_
-#define CONTENT_RENDERER_MEDIA_WEBRTC_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:::VideoTrackInterface and a content::MediaStreamVideoSink.
-// It is responsible for translating video data from a libjingle video type
-// to a chrome video type.
-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_;
- bool track_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(WebRtcVideoSinkAdapter);
-};
-
-} // namespace content
-
-#endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_SINK_ADAPTER_H_

Powered by Google App Engine
This is Rietveld 408576698