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

Side by Side Diff: talk/app/webrtc/objc/avfoundationvideocapturer.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 | « talk/app/webrtc/objc/RTCVideoCapturer.mm ('k') | talk/app/webrtc/peerconnection.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 2015 Google Inc. 3 * Copyright 2015 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 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_OBJC_AVFOUNDATION_VIDEO_CAPTURER_H_ 28 #ifndef TALK_APP_WEBRTC_OBJC_AVFOUNDATION_VIDEO_CAPTURER_H_
29 #define TALK_APP_WEBRTC_OBJC_AVFOUNDATION_VIDEO_CAPTURER_H_ 29 #define TALK_APP_WEBRTC_OBJC_AVFOUNDATION_VIDEO_CAPTURER_H_
30 30
31 #include "talk/media/base/videocapturer.h"
32 #include "webrtc/base/scoped_ptr.h" 31 #include "webrtc/base/scoped_ptr.h"
32 #include "webrtc/media/base/videocapturer.h"
33 #include "webrtc/video_frame.h" 33 #include "webrtc/video_frame.h"
34 34
35 #import <AVFoundation/AVFoundation.h> 35 #import <AVFoundation/AVFoundation.h>
36 36
37 @class RTCAVFoundationVideoCapturerInternal; 37 @class RTCAVFoundationVideoCapturerInternal;
38 38
39 namespace webrtc { 39 namespace webrtc {
40 40
41 class AVFoundationVideoCapturer : public cricket::VideoCapturer { 41 class AVFoundationVideoCapturer : public cricket::VideoCapturer {
42 public: 42 public:
(...skipping 26 matching lines...) Expand all
69 // Used to signal frame capture on the thread that capturer was started on. 69 // Used to signal frame capture on the thread that capturer was started on.
70 void SignalFrameCapturedOnStartThread(const cricket::CapturedFrame* frame); 70 void SignalFrameCapturedOnStartThread(const cricket::CapturedFrame* frame);
71 71
72 RTCAVFoundationVideoCapturerInternal* _capturer; 72 RTCAVFoundationVideoCapturerInternal* _capturer;
73 rtc::Thread* _startThread; // Set in Start(), unset in Stop(). 73 rtc::Thread* _startThread; // Set in Start(), unset in Stop().
74 }; // AVFoundationVideoCapturer 74 }; // AVFoundationVideoCapturer
75 75
76 } // namespace webrtc 76 } // namespace webrtc
77 77
78 #endif // TALK_APP_WEBRTC_OBJC_AVFOUNDATION_CAPTURER_H_ 78 #endif // TALK_APP_WEBRTC_OBJC_AVFOUNDATION_CAPTURER_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/RTCVideoCapturer.mm ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698