diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 23:40:54 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 23:40:54 +0000 |
| commit | 21f7d9069f091ecea5c2e904ca59a76b29b0854c (patch) | |
| tree | dc9c3d503da9b111ac7efc9f0fe560ede73b6b1b | |
| parent | 826053d2b7bbeff2207588b3e09f99498bbc0821 (diff) | |
| download | chromium_src-21f7d9069f091ecea5c2e904ca59a76b29b0854c.zip chromium_src-21f7d9069f091ecea5c2e904ca59a76b29b0854c.tar.gz chromium_src-21f7d9069f091ecea5c2e904ca59a76b29b0854c.tar.bz2 | |
Update webrtc/libjingle to 5831.
R=mallinath@chromium.org, wjia@chromium.org
Review URL: https://codereview.chromium.org/221533002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261224 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/renderer/media/webrtc_audio_device_not_impl.cc | 8 | ||||
| -rw-r--r-- | content/renderer/media/webrtc_audio_device_not_impl.h | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
4 files changed, 2 insertions, 12 deletions
@@ -55,7 +55,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. - "webrtc_revision": "5807", + "webrtc_revision": "5831", "jsoncpp_revision": "248", "nss_revision": "259440", # Three lines of non-changing comments so that diff --git a/content/renderer/media/webrtc_audio_device_not_impl.cc b/content/renderer/media/webrtc_audio_device_not_impl.cc index a126acd..b838c21 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.cc +++ b/content/renderer/media/webrtc_audio_device_not_impl.cc @@ -101,10 +101,6 @@ int32_t WebRtcAudioDeviceNotImpl::WaveOutVolume( return 0; } -int32_t WebRtcAudioDeviceNotImpl::SpeakerIsAvailable(bool* available) { - return 0; -} - int32_t WebRtcAudioDeviceNotImpl::InitSpeaker() { return 0; } @@ -113,10 +109,6 @@ bool WebRtcAudioDeviceNotImpl::SpeakerIsInitialized() const { return 0; } -int32_t WebRtcAudioDeviceNotImpl::MicrophoneIsAvailable(bool* available) { - return 0; -} - int32_t WebRtcAudioDeviceNotImpl::InitMicrophone() { return 0; } diff --git a/content/renderer/media/webrtc_audio_device_not_impl.h b/content/renderer/media/webrtc_audio_device_not_impl.h index 041c7d4..fad4f3f 100644 --- a/content/renderer/media/webrtc_audio_device_not_impl.h +++ b/content/renderer/media/webrtc_audio_device_not_impl.h @@ -58,10 +58,8 @@ class CONTENT_EXPORT WebRtcAudioDeviceNotImpl uint16_t volume_right) OVERRIDE; virtual int32_t WaveOutVolume(uint16_t* volume_left, uint16_t* volume_right) const OVERRIDE; - virtual int32_t SpeakerIsAvailable(bool* available) OVERRIDE; virtual int32_t InitSpeaker() OVERRIDE; virtual bool SpeakerIsInitialized() const OVERRIDE; - virtual int32_t MicrophoneIsAvailable(bool* available) OVERRIDE; virtual int32_t InitMicrophone() OVERRIDE; virtual bool MicrophoneIsInitialized() const OVERRIDE; virtual int32_t SpeakerVolumeIsAvailable(bool* available) OVERRIDE; diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index b079e3a..a9ee108 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 5807 +Revision: 5831 License: BSD License File: source/talk/COPYING Security Critical: yes |