diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 6 | ||||
| -rw-r--r-- | content/renderer/media/video_capture_module_impl.cc | 7 | ||||
| -rw-r--r-- | content/renderer/media/video_capture_module_impl_device_info.cc | 14 |
4 files changed, 4 insertions, 25 deletions
@@ -31,7 +31,7 @@ vars = { "sfntly_revision": "54", "skia_revision": "2280", "v8_revision": "9288", - "webrtc_revision": "565", + "webrtc_revision": "614", # Note: On most bots, clang is not checked out via DEPS but by # tools/clang/scripts/update.sh. The script reads this line here. diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 8eea52d..6458df69 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -236,10 +236,10 @@ }], ['enable_webrtc==1', { 'dependencies': [ - '../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module', + '../third_party/webrtc/modules/modules.gyp:video_capture_module', '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core', - '../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', + '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', + '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', ], 'sources': [ 'renderer/media/video_capture_module_impl.cc', diff --git a/content/renderer/media/video_capture_module_impl.cc b/content/renderer/media/video_capture_module_impl.cc index ad1f908..a05be09 100644 --- a/content/renderer/media/video_capture_module_impl.cc +++ b/content/renderer/media/video_capture_module_impl.cc @@ -6,13 +6,6 @@ #include "content/renderer/media/video_capture_impl_manager.h" -// static -webrtc::VideoCaptureModule* webrtc::VideoCaptureModule::Create( - const WebRtc_Word32 id, const WebRtc_UWord8* device_unique_id_utf8) { - NOTREACHED(); - return NULL; -} - VideoCaptureModuleImpl::VideoCaptureModuleImpl( const media::VideoCaptureSessionId id, VideoCaptureImplManager* vc_manager) diff --git a/content/renderer/media/video_capture_module_impl_device_info.cc b/content/renderer/media/video_capture_module_impl_device_info.cc index f647fd5..6fd9f3c 100644 --- a/content/renderer/media/video_capture_module_impl_device_info.cc +++ b/content/renderer/media/video_capture_module_impl_device_info.cc @@ -8,20 +8,6 @@ static const char* kLocalDeviceName = "chromecamera"; -// static -webrtc::VideoCaptureModule::DeviceInfo* -webrtc::VideoCaptureModule::CreateDeviceInfo(const WebRtc_Word32 id) { - return new VideoCaptureModuleImplDeviceInfo(id); -} - -// static -void webrtc::VideoCaptureModule::DestroyDeviceInfo( - webrtc::VideoCaptureModule::DeviceInfo* device_info) { - VideoCaptureModuleImplDeviceInfo* dev_info = - static_cast<VideoCaptureModuleImplDeviceInfo*>(device_info); - delete dev_info; -} - VideoCaptureModuleImplDeviceInfo::VideoCaptureModuleImplDeviceInfo( const WebRtc_Word32 id) { } |