content/renderer/media/video_capture_module_impl.h - Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h

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

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix content_unittests build failure Created 8 years, 8 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/video_capture_impl_unittest.cc ('k') | content/renderer/media/video_capture_module_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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_VIDEO_CAPTURE_MODULE_IMPL_H_	5 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MODULE_IMPL_H_

6 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MODULE_IMPL_H_	6 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MODULE_IMPL_H_

7	7

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

9 #include "base/synchronization/waitable_event.h"	9 #include "base/synchronization/waitable_event.h"

10 #include "base/threading/thread.h"	10 #include "base/threading/thread.h"

11 #include "content/common/media/video_capture.h"	11 #include "content/common/media/video_capture.h"

12 #include "media/video/capture/video_capture.h"	12 #include "media/video/capture/video_capture.h"

	13 #include "media/video/capture/video_capture_types.h"

13 #include "third_party/webrtc/common_types.h"	14 #include "third_party/webrtc/common_types.h"

14 #include "third_party/webrtc/modules/video_capture/main/interface/video_capture_ defines.h"	15 #include "third_party/webrtc/modules/video_capture/main/interface/video_capture_ defines.h"

15 #include "third_party/webrtc/modules/video_capture/main/source/video_capture_imp l.h"	16 #include "third_party/webrtc/modules/video_capture/main/source/video_capture_imp l.h"

16	17

17 class VideoCaptureImplManager;	18 class VideoCaptureImplManager;

18	19

19 // An implementation of webrtc::VideoCaptureModule takes raw frames from video	20 // An implementation of webrtc::VideoCaptureModule takes raw frames from video

20 // capture engine and passed them to webrtc VideoEngine.	21 // capture engine and passed them to webrtc VideoEngine.

21 class VideoCaptureModuleImpl	22 class VideoCaptureModuleImpl

22 : public webrtc::videocapturemodule::VideoCaptureImpl,	23 : public webrtc::videocapturemodule::VideoCaptureImpl,

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 webrtc::VideoCaptureCapability frameInfo_;	80 webrtc::VideoCaptureCapability frameInfo_;

80 base::Time start_time_;	81 base::Time start_time_;

81 // The video capture module generating raw frame data.	82 // The video capture module generating raw frame data.

82 media::VideoCapture* capture_engine_;	83 media::VideoCapture* capture_engine_;

83 int ref_count_;	84 int ref_count_;

84	85

85 DISALLOW_COPY_AND_ASSIGN(VideoCaptureModuleImpl);	86 DISALLOW_COPY_AND_ASSIGN(VideoCaptureModuleImpl);

86 };	87 };

87	88

88 #endif // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MODULE_IMPL_H_	89 #endif // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_MODULE_IMPL_H_

OLD	NEW