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

Side by Side Diff: talk/app/webrtc/videosource.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/test/fakevideotrackrenderer.h ('k') | talk/app/webrtc/videosource.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 16 matching lines...) Expand all
27 27
28 #ifndef TALK_APP_WEBRTC_VIDEOSOURCE_H_ 28 #ifndef TALK_APP_WEBRTC_VIDEOSOURCE_H_
29 #define TALK_APP_WEBRTC_VIDEOSOURCE_H_ 29 #define TALK_APP_WEBRTC_VIDEOSOURCE_H_
30 30
31 #include <list> 31 #include <list>
32 32
33 #include "talk/app/webrtc/mediastreaminterface.h" 33 #include "talk/app/webrtc/mediastreaminterface.h"
34 #include "talk/app/webrtc/notifier.h" 34 #include "talk/app/webrtc/notifier.h"
35 #include "talk/app/webrtc/videosourceinterface.h" 35 #include "talk/app/webrtc/videosourceinterface.h"
36 #include "talk/app/webrtc/videotrackrenderers.h" 36 #include "talk/app/webrtc/videotrackrenderers.h"
37 #include "talk/media/base/videocapturer.h"
38 #include "talk/media/base/videocommon.h"
39 #include "webrtc/base/scoped_ptr.h" 37 #include "webrtc/base/scoped_ptr.h"
40 #include "webrtc/base/sigslot.h" 38 #include "webrtc/base/sigslot.h"
41 #include "webrtc/media/base/videosinkinterface.h" 39 #include "webrtc/media/base/videosinkinterface.h"
40 #include "webrtc/media/base/videocapturer.h"
41 #include "webrtc/media/base/videocommon.h"
42 42
43 // VideoSource implements VideoSourceInterface. It owns a 43 // VideoSource implements VideoSourceInterface. It owns a
44 // cricket::VideoCapturer and make sure the camera is started at a resolution 44 // cricket::VideoCapturer and make sure the camera is started at a resolution
45 // that honors the constraints. 45 // that honors the constraints.
46 // The state is set depending on the result of starting the capturer. 46 // The state is set depending on the result of starting the capturer.
47 // If the constraint can't be met or the capturer fails to start, the state 47 // If the constraint can't be met or the capturer fails to start, the state
48 // transition to kEnded, otherwise it transitions to kLive. 48 // transition to kEnded, otherwise it transitions to kLive.
49 49
50 namespace cricket { 50 namespace cricket {
51 51
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 cricket::VideoFormat format_; 109 cricket::VideoFormat format_;
110 cricket::VideoOptions options_; 110 cricket::VideoOptions options_;
111 SourceState state_; 111 SourceState state_;
112 const bool remote_; 112 const bool remote_;
113 }; 113 };
114 114
115 } // namespace webrtc 115 } // namespace webrtc
116 116
117 #endif // TALK_APP_WEBRTC_VIDEOSOURCE_H_ 117 #endif // TALK_APP_WEBRTC_VIDEOSOURCE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/test/fakevideotrackrenderer.h ('k') | talk/app/webrtc/videosource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698