Commit 8aa707b5 authored by Tommi's avatar Tommi

Roll WebRTC 8176:8203, Libjingle 8174:8202

WebRTC 8176:8203
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/9fbfe8f..7b9e261

Libjingle 8174:8202
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/6660ffc..237ae43

TBR=kjellander@chromium.org

Review URL: https://codereview.chromium.org/885003003

Cr-Commit-Position: refs/heads/master@{#313705}
parent 3601a927
...@@ -212,7 +212,7 @@ deps = { ...@@ -212,7 +212,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '43b80ebd6a901d6828c73060dd1494daf795779d', Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '43b80ebd6a901d6828c73060dd1494daf795779d',
'src/third_party/libjingle/source/talk': 'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '6660ffc92169089f5a4477506163da83e5cecd62', # from svn revision 8174 Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '237ae435ae0074020082be32870ebc731a9242b9', # from svn revision 8202
'src/third_party/usrsctp/usrsctplib': 'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14', Var('chromium_git') + '/external/usrsctplib.git' + '@' + '190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14',
...@@ -236,7 +236,7 @@ deps = { ...@@ -236,7 +236,7 @@ deps = {
Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
'src/third_party/webrtc': 'src/third_party/webrtc':
Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '9fbfe8febb72cfc1bcd6c1023a075645c0a47f30', # from svn revision 8176 Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '7b9e2619cb14106e88249eed305358f3b86dc119', # from svn revision 8203
'src/third_party/openmax_dl': 'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
......
...@@ -10,10 +10,6 @@ WebRtcAudioDeviceNotImpl::WebRtcAudioDeviceNotImpl() ...@@ -10,10 +10,6 @@ WebRtcAudioDeviceNotImpl::WebRtcAudioDeviceNotImpl()
: last_process_time_(base::TimeTicks::Now()) { : last_process_time_(base::TimeTicks::Now()) {
} }
int32_t WebRtcAudioDeviceNotImpl::ChangeUniqueId(const int32_t id) {
return 0;
}
int64_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() { int64_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() {
const int64_t kMillisecondsBetweenProcessCalls = 5000; const int64_t kMillisecondsBetweenProcessCalls = 5000;
base::TimeDelta delta_time = (base::TimeTicks::Now() - last_process_time_); base::TimeDelta delta_time = (base::TimeTicks::Now() - last_process_time_);
......
...@@ -28,7 +28,6 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl ...@@ -28,7 +28,6 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl
// TODO(henrika): it is possible to add functionality in these methods. // TODO(henrika): it is possible to add functionality in these methods.
// Only adding very basic support for now without triggering any callback // Only adding very basic support for now without triggering any callback
// in the webrtc::AudioDeviceObserver interface. // in the webrtc::AudioDeviceObserver interface.
int32_t ChangeUniqueId(const int32_t id) override;
int64_t TimeUntilNextProcess() override; int64_t TimeUntilNextProcess() override;
int32_t Process() override; int32_t Process() override;
......
Name: libjingle Name: libjingle
URL: http://code.google.com/p/webrtc/ URL: http://code.google.com/p/webrtc/
Version: unknown Version: unknown
Revision: 8174 Revision: 8202
License: BSD License: BSD
License File: source/talk/COPYING License File: source/talk/COPYING
Security Critical: yes Security Critical: yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment