content/renderer/media/webrtc/media_stream_remote_video_source.h - Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the …

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/media_stream_remote_video_source.h

Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « content/renderer/media/video_track_adapter.cc ('k') | content/renderer/media/webrtc/media_stream_remote_video_source_unittest.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_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/threading/thread_checker.h"

8 #include "content/common/content_export.h"	9 #include "content/common/content_export.h"

9 #include "content/renderer/media/media_stream_video_source.h"	10 #include "content/renderer/media/media_stream_video_source.h"

10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"	11 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

11 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"	12 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"

12	13

13 namespace content {	14 namespace content {

14	15

15 // MediaStreamRemoteVideoSource implements the MediaStreamVideoSource interface	16 // MediaStreamRemoteVideoSource implements the MediaStreamVideoSource interface

16 // for video tracks received on a PeerConnection. The purpose of the class is	17 // for video tracks received on a PeerConnection. The purpose of the class is

17 // to make sure there is no difference between a video track where the source is	18 // to make sure there is no difference between a video track where the source is

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55	56

56 // Bound to the render thread.	57 // Bound to the render thread.

57 base::ThreadChecker thread_checker_;	58 base::ThreadChecker thread_checker_;

58	59

59 DISALLOW_COPY_AND_ASSIGN(MediaStreamRemoteVideoSource);	60 DISALLOW_COPY_AND_ASSIGN(MediaStreamRemoteVideoSource);

60 };	61 };

61	62

62 } // namespace content	63 } // namespace content

63	64

64 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_	65 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_REMOTE_VIDEO_SOURCE_H_

OLD	NEW