diff options
author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-07 22:09:08 +0000 |
---|---|---|
committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-07 22:09:08 +0000 |
commit | c7416745e9d35902e62517d1bddcd546623e1c34 (patch) | |
tree | e5bbb46d7476ff167c6fd4977491066b293d7e14 /media/webrtc | |
parent | 58271c37d7593914ad7b4477cabbce69cd6adcd4 (diff) | |
download | talk-c7416745e9d35902e62517d1bddcd546623e1c34.tar.gz |
(Auto)update libjingle 72839629-> 72847605
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6854 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/webrtc')
-rwxr-xr-x | media/webrtc/webrtcvideocapturerfactory.cc | 43 | ||||
-rwxr-xr-x | media/webrtc/webrtcvideocapturerfactory.h | 43 |
2 files changed, 86 insertions, 0 deletions
diff --git a/media/webrtc/webrtcvideocapturerfactory.cc b/media/webrtc/webrtcvideocapturerfactory.cc new file mode 100755 index 0000000..9f542bd --- /dev/null +++ b/media/webrtc/webrtcvideocapturerfactory.cc @@ -0,0 +1,43 @@ +/* + * libjingle + * Copyright 2014 Google Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "talk/media/webrtc/webrtcvideocapturer.h" +#include "talk/media/webrtc/webrtcvideocapturerfactory.h" +#include "webrtc/base/scoped_ptr.h" + +namespace cricket { + +VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) { + rtc::scoped_ptr<WebRtcVideoCapturer> capturer( + new WebRtcVideoCapturer()); + if (!capturer->Init(device)) { + return NULL; + } + return capturer.release(); +} + +} // namespace cricket diff --git a/media/webrtc/webrtcvideocapturerfactory.h b/media/webrtc/webrtcvideocapturerfactory.h new file mode 100755 index 0000000..091b072 --- /dev/null +++ b/media/webrtc/webrtcvideocapturerfactory.h @@ -0,0 +1,43 @@ +// libjingle +// Copyright 2014 Google Inc. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// 3. The name of the author may not be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +// TODO(pthatcher): Reneme file to match class name. +#ifndef TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ +#define TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ + +#include "talk/media/base/videocapturerfactory.h" + +namespace cricket { + +// Creates instances of cricket::WebRtcVideoCapturer. +class WebRtcVideoDeviceCapturerFactory : public VideoDeviceCapturerFactory { + public: + virtual VideoCapturer* Create(const Device& device); +}; + +} // namespace cricket + +#endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ |