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

Side by Side Diff: talk/app/webrtc/videosourceinterface.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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
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 11 matching lines...) Expand all
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_VIDEOSOURCEINTERFACE_H_ 28 #ifndef TALK_APP_WEBRTC_VIDEOSOURCEINTERFACE_H_
29 #define TALK_APP_WEBRTC_VIDEOSOURCEINTERFACE_H_ 29 #define TALK_APP_WEBRTC_VIDEOSOURCEINTERFACE_H_
30 30
31 #include "talk/app/webrtc/mediastreaminterface.h" 31 #include "talk/app/webrtc/mediastreaminterface.h"
32 #include "talk/media/base/mediachannel.h" 32 #include "webrtc/media/base/mediachannel.h"
33 33
34 namespace webrtc { 34 namespace webrtc {
35 35
36 // VideoSourceInterface is a reference counted source used for VideoTracks. 36 // VideoSourceInterface is a reference counted source used for VideoTracks.
37 // The same source can be used in multiple VideoTracks. 37 // The same source can be used in multiple VideoTracks.
38 // The methods are only supposed to be called by the PeerConnection 38 // The methods are only supposed to be called by the PeerConnection
39 // implementation. 39 // implementation.
40 class VideoSourceInterface : public MediaSourceInterface { 40 class VideoSourceInterface : public MediaSourceInterface {
41 public: 41 public:
42 // Get access to the source implementation of cricket::VideoCapturer. 42 // Get access to the source implementation of cricket::VideoCapturer.
(...skipping 11 matching lines...) Expand all
54 virtual const cricket::VideoOptions* options() const = 0; 54 virtual const cricket::VideoOptions* options() const = 0;
55 virtual cricket::VideoRenderer* FrameInput() = 0; 55 virtual cricket::VideoRenderer* FrameInput() = 0;
56 56
57 protected: 57 protected:
58 virtual ~VideoSourceInterface() {} 58 virtual ~VideoSourceInterface() {}
59 }; 59 };
60 60
61 } // namespace webrtc 61 } // namespace webrtc
62 62
63 #endif // TALK_APP_WEBRTC_VIDEOSOURCEINTERFACE_H_ 63 #endif // TALK_APP_WEBRTC_VIDEOSOURCEINTERFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698