diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-10-11 17:13:51 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-10-11 17:13:51 +0000 |
| commit | ea89922b56eeb7b4c51d09dee1fbee9fadd549eb (patch) | |
| tree | 684eef1fcab050ac0d681956e3fa2c5e398fd978 /third_party_mods | |
| parent | 199f4defd35c67d1df9dc2c91757f31f21894d5a (diff) | |
| download | webrtc-ea89922b56eeb7b4c51d09dee1fbee9fadd549eb.tar.gz | |
Add VideoCaptureFactory so that we don't need to expose VideoCaptureImpl.
BUG=
TEST=
Review URL: http://webrtc-codereview.appspot.com/213002
git-svn-id: http://webrtc.googlecode.com/svn/trunk@727 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'third_party_mods')
| -rw-r--r-- | third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc b/third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc index b08647bd08..6bf9897794 100644 --- a/third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc +++ b/third_party_mods/libjingle/source/talk/examples/peerconnection_client/conductor.cc @@ -12,7 +12,7 @@ #include <utility> -#include "modules/video_capture/main/source/video_capture_impl.h" +#include "modules/video_capture/main/interface/video_capture_factory.h" #include "talk/examples/peerconnection_client/defaults.h" #include "talk/base/common.h" #include "talk/base/logging.h" @@ -222,7 +222,7 @@ void Conductor::ConnectToPeer(int peer_id) { scoped_refptr<webrtc::VideoCaptureModule> Conductor::OpenVideoCaptureDevice() { webrtc::VideoCaptureModule::DeviceInfo* device_info( - webrtc::videocapturemodule::VideoCaptureImpl::CreateDeviceInfo(0)); + webrtc::VideoCaptureFactory::CreateDeviceInfo(0)); scoped_refptr<webrtc::VideoCaptureModule> video_device; const size_t kMaxDeviceNameLength = 128; @@ -237,11 +237,11 @@ scoped_refptr<webrtc::VideoCaptureModule> Conductor::OpenVideoCaptureDevice() { kMaxUniqueIdLength); // Try to open this device. video_device = - webrtc::videocapturemodule::VideoCaptureImpl::Create(0, unique_id); + webrtc::VideoCaptureFactory::Create(0, unique_id); if (video_device.get()) break; } - webrtc::videocapturemodule::VideoCaptureImpl::DestroyDeviceInfo(device_info); + webrtc::VideoCaptureFactory::DestroyDeviceInfo(device_info); return video_device; } |