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

Side by Side Diff: webrtc/media/base/capturemanager.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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 | « webrtc/media/base/audiorenderer.h ('k') | webrtc/media/base/capturemanager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 20 matching lines...) Expand all
31 // and start capturing as doing so will affect the other instance. 31 // and start capturing as doing so will affect the other instance.
32 // The class employs reference counting on starting and stopping of capturing of 32 // The class employs reference counting on starting and stopping of capturing of
33 // frames such that if anyone is still listening it will not be stopped. The 33 // frames such that if anyone is still listening it will not be stopped. The
34 // class also provides APIs for attaching VideoRenderers to a specific capturer 34 // class also provides APIs for attaching VideoRenderers to a specific capturer
35 // such that the VideoRenderers are fed frames directly from the capturer. 35 // such that the VideoRenderers are fed frames directly from the capturer.
36 // CaptureManager is Thread-unsafe. This means that none of its APIs may be 36 // CaptureManager is Thread-unsafe. This means that none of its APIs may be
37 // called concurrently. Note that callbacks are called by the VideoCapturer's 37 // called concurrently. Note that callbacks are called by the VideoCapturer's
38 // thread which is normally a separate unmarshalled thread and thus normally 38 // thread which is normally a separate unmarshalled thread and thus normally
39 // require lock protection. 39 // require lock protection.
40 40
41 #ifndef TALK_MEDIA_BASE_CAPTUREMANAGER_H_ 41 #ifndef WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
42 #define TALK_MEDIA_BASE_CAPTUREMANAGER_H_ 42 #define WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
43 43
44 #include <map> 44 #include <map>
45 #include <vector> 45 #include <vector>
46 46
47 #include "talk/media/base/capturerenderadapter.h"
48 #include "talk/media/base/videocommon.h"
49 #include "webrtc/base/sigslotrepeater.h" 47 #include "webrtc/base/sigslotrepeater.h"
50 #include "webrtc/base/thread_checker.h" 48 #include "webrtc/base/thread_checker.h"
49 #include "webrtc/media/base/capturerenderadapter.h"
50 #include "webrtc/media/base/videocommon.h"
51 51
52 namespace cricket { 52 namespace cricket {
53 53
54 class VideoCapturer; 54 class VideoCapturer;
55 class VideoRenderer; 55 class VideoRenderer;
56 class VideoCapturerState; 56 class VideoCapturerState;
57 57
58 class CaptureManager : public sigslot::has_slots<> { 58 class CaptureManager : public sigslot::has_slots<> {
59 public: 59 public:
60 enum RestartOptions { 60 enum RestartOptions {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 VideoCapturerState* GetCaptureState(VideoCapturer* video_capturer) const; 99 VideoCapturerState* GetCaptureState(VideoCapturer* video_capturer) const;
100 CaptureRenderAdapter* GetAdapter(VideoCapturer* video_capturer) const; 100 CaptureRenderAdapter* GetAdapter(VideoCapturer* video_capturer) const;
101 101
102 rtc::ThreadChecker thread_checker_; 102 rtc::ThreadChecker thread_checker_;
103 CaptureStates capture_states_; 103 CaptureStates capture_states_;
104 }; 104 };
105 105
106 } // namespace cricket 106 } // namespace cricket
107 107
108 #endif // TALK_MEDIA_BASE_CAPTUREMANAGER_H_ 108 #endif // WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/audiorenderer.h ('k') | webrtc/media/base/capturemanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698