Commit 5f0be344 authored by tommi's avatar tommi Committed by Commit bot

Roll WebRTC 7902:7905, Libjingle 7898:7905

WebRTC 7902:7905
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/e8dbbf4..25834b8

Libjingle 7898:7905
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/35f09c3..f99af5c

TBR=kjellander@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#308461}
parent e0a1ab0b
......@@ -220,7 +220,7 @@ deps = {
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '7b98b0fc40ec9bdc379b9d8353bf9b669409757b',
'src/third_party/libjingle/source/talk':
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '35f09c3d7842dd65644bbddaa7079cdb7d930017', # from svn revision 7898
Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'f99af5cfa56f631612c003243b87d9563e68aa82', # from svn revision 7905
'src/third_party/usrsctp/usrsctplib':
Var('chromium_git') + '/external/usrsctplib.git' + '@' + '190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14',
......@@ -244,7 +244,7 @@ deps = {
Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
'src/third_party/webrtc':
Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'e8dbbf4ae77754ee7a0bf60dc9f7f8245776643d', # from svn revision 7902
Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '25834b8c361c58d2669f3b9354f0913c2a7c8e64', # from svn revision 7905
'src/third_party/openmax_dl':
Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'),
......
......@@ -4,12 +4,6 @@
#include "content/renderer/media/webrtc_audio_device_not_impl.h"
namespace {
const int64 kMillisecondsBetweenProcessCalls = 5000;
} // namespace
namespace content {
WebRtcAudioDeviceNotImpl::WebRtcAudioDeviceNotImpl()
......@@ -20,11 +14,10 @@ int32_t WebRtcAudioDeviceNotImpl::ChangeUniqueId(const int32_t id) {
return 0;
}
int32_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() {
int64_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() {
const int64_t kMillisecondsBetweenProcessCalls = 5000;
base::TimeDelta delta_time = (base::TimeTicks::Now() - last_process_time_);
int64 time_until_next =
kMillisecondsBetweenProcessCalls - delta_time.InMilliseconds();
return static_cast<int32_t>(time_until_next);
return kMillisecondsBetweenProcessCalls - delta_time.InMilliseconds();
}
int32_t WebRtcAudioDeviceNotImpl::Process() {
......
......@@ -29,7 +29,7 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl
// Only adding very basic support for now without triggering any callback
// in the webrtc::AudioDeviceObserver interface.
int32_t ChangeUniqueId(const int32_t id) override;
int32_t TimeUntilNextProcess() override;
int64_t TimeUntilNextProcess() override;
int32_t Process() override;
// Methods in webrtc::AudioDeviceModule which are not yet implemented.
......
Name: libjingle
URL: http://code.google.com/p/webrtc/
Version: unknown
Revision: 7898
Revision: 7905
License: BSD
License File: source/talk/COPYING
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