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

Side by Side Diff: talk/app/webrtc/androidvideocapturer.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 | « resources/media/voice.rtpdump.sha1 ('k') | talk/app/webrtc/androidvideocapturer.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 12 matching lines...) Expand all
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 #ifndef TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_ 27 #ifndef TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
28 #define TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_ 28 #define TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
29 29
30 #include <string> 30 #include <string>
31 #include <vector> 31 #include <vector>
32 32
33 #include "talk/media/base/videocapturer.h"
34 #include "webrtc/base/thread_checker.h" 33 #include "webrtc/base/thread_checker.h"
35 #include "webrtc/common_video/include/video_frame_buffer.h" 34 #include "webrtc/common_video/include/video_frame_buffer.h"
35 #include "webrtc/media/base/videocapturer.h"
36 36
37 namespace webrtc { 37 namespace webrtc {
38 38
39 class AndroidVideoCapturer; 39 class AndroidVideoCapturer;
40 40
41 class AndroidVideoCapturerDelegate : public rtc::RefCountInterface { 41 class AndroidVideoCapturerDelegate : public rtc::RefCountInterface {
42 public: 42 public:
43 virtual ~AndroidVideoCapturerDelegate() {} 43 virtual ~AndroidVideoCapturerDelegate() {}
44 // Start capturing. The implementation of the delegate must call 44 // Start capturing. The implementation of the delegate must call
45 // AndroidVideoCapturer::OnCapturerStarted with the result of this request. 45 // AndroidVideoCapturer::OnCapturerStarted with the result of this request.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 class FrameFactory; 100 class FrameFactory;
101 FrameFactory* frame_factory_; // Owned by cricket::VideoCapturer. 101 FrameFactory* frame_factory_; // Owned by cricket::VideoCapturer.
102 102
103 cricket::CaptureState current_state_; 103 cricket::CaptureState current_state_;
104 }; 104 };
105 105
106 } // namespace webrtc 106 } // namespace webrtc
107 107
108 #endif // TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_ 108 #endif // TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « resources/media/voice.rtpdump.sha1 ('k') | talk/app/webrtc/androidvideocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698