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

Side by Side Diff: content/renderer/media/webrtc/media_stream_remote_video_source.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "content/renderer/media/media_stream_video_source.h" 12 #include "content/renderer/media/media_stream_video_source.h"
13 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 13 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
14 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 14 #include "third_party/webrtc/api/mediastreaminterface.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class TrackObserver; 18 class TrackObserver;
19 19
20 // MediaStreamRemoteVideoSource implements the MediaStreamVideoSource interface 20 // MediaStreamRemoteVideoSource implements the MediaStreamVideoSource interface
21 // for video tracks received on a PeerConnection. The purpose of the class is 21 // for video tracks received on a PeerConnection. The purpose of the class is
22 // to make sure there is no difference between a video track where the source is 22 // to make sure there is no difference between a video track where the source is
23 // a local source and a video track where the source is a remote video track. 23 // a local source and a video track where the source is a remote video track.
24 class CONTENT_EXPORT MediaStreamRemoteVideoSource 24 class CONTENT_EXPORT MediaStreamRemoteVideoSource
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class RemoteVideoSourceDelegate; 59 class RemoteVideoSourceDelegate;
60 scoped_refptr<RemoteVideoSourceDelegate> delegate_; 60 scoped_refptr<RemoteVideoSourceDelegate> delegate_;
61 scoped_ptr<TrackObserver> observer_; 61 scoped_ptr<TrackObserver> observer_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(MediaStreamRemoteVideoSource); 63 DISALLOW_COPY_AND_ASSIGN(MediaStreamRemoteVideoSource);
64 }; 64 };
65 65
66 } // namespace content 66 } // namespace content
67 67
68 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_ 68 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698