content/renderer/media/webrtc/webrtc_media_stream_adapter.h - Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.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

« no previous file with comments | « content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc ('k') | content/renderer/media/webrtc_audio_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_WEBRTC_MEDIA_STREAM_ADAPTER_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_

6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_	6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

10 #include "base/memory/scoped_vector.h"	10 #include "base/memory/scoped_vector.h"

11 #include "content/common/content_export.h"	11 #include "content/common/content_export.h"

12 #include "content/renderer/media/media_stream.h"	12 #include "content/renderer/media/media_stream.h"

13 #include "third_party/WebKit/public/platform/WebMediaStream.h"	13 #include "third_party/WebKit/public/platform/WebMediaStream.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 PeerConnectionDependencyFactory;	18 class PeerConnectionDependencyFactory;

19 class MediaStreamVideoWebRtcSink;	19 class MediaStreamVideoWebRtcSink;

20	20

21 // WebRtcMediaStreamAdapter is an adapter between a blink::WebMediaStream	21 // WebRtcMediaStreamAdapter is an adapter between a blink::WebMediaStream

22 // object and a webrtc MediaStreams that is currently sent on a PeerConnection.	22 // object and a webrtc MediaStreams that is currently sent on a PeerConnection.

23 // The responsibility of the class is to create and own a representation of a	23 // The responsibility of the class is to create and own a representation of a

24 // webrtc MediaStream that can be added and removed from a RTCPeerConnection.	24 // webrtc MediaStream that can be added and removed from a RTCPeerConnection.

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58	58

59 scoped_refptr<webrtc::MediaStreamInterface> webrtc_media_stream_;	59 scoped_refptr<webrtc::MediaStreamInterface> webrtc_media_stream_;

60 ScopedVector<MediaStreamVideoWebRtcSink> video_adapters_;	60 ScopedVector<MediaStreamVideoWebRtcSink> video_adapters_;

61	61

62 DISALLOW_COPY_AND_ASSIGN (WebRtcMediaStreamAdapter);	62 DISALLOW_COPY_AND_ASSIGN (WebRtcMediaStreamAdapter);

63 };	63 };

64	64

65 } // namespace content	65 } // namespace content

66	66

67 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_	67 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_MEDIA_STREAM_ADAPTER_H_

OLD	NEW