diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 02:02:54 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-17 02:02:54 +0000 |
| commit | 863369f78d9c2b4f774e693fdef8943deba270fa (patch) | |
| tree | eb26aa6471148152a16a9ecf2950d2dcd76bc5ff /content/renderer | |
| parent | 2c30adb144694822d2eeec760e7874262c82028a (diff) | |
| download | chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.zip chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.tar.gz chromium_src-863369f78d9c2b4f774e693fdef8943deba270fa.tar.bz2 | |
Update webrtc/libjingle 5268:5301.
R=grunell@chromium.org, mallinath@chromium.org, sergeyu@chromium.org, wjia@chromium.org
Review URL: https://codereview.chromium.org/103143004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/media/media_stream_audio_processor.cc | 7 | ||||
| -rw-r--r-- | content/renderer/media/media_stream_dependency_factory.cc | 2 | ||||
| -rw-r--r-- | content/renderer/p2p/ipc_socket_factory.cc | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc index 07974aa..98439c7 100644 --- a/content/renderer/media/media_stream_audio_processor.cc +++ b/content/renderer/media/media_stream_audio_processor.cc @@ -233,8 +233,6 @@ void MediaStreamAudioProcessor::InitializeAudioProcessingModule( constraints, MediaConstraintsInterface::kNoiseSuppression); const bool enable_high_pass_filter = GetPropertyFromConstraints( constraints, MediaConstraintsInterface::kHighpassFilter); - const bool start_aec_dump = GetPropertyFromConstraints( - constraints, MediaConstraintsInterface::kInternalAecDump); #if defined(IOS) || defined(ANDROID) const bool enable_experimental_aec = false; const bool enable_typing_detection = false; @@ -270,8 +268,6 @@ void MediaStreamAudioProcessor::InitializeAudioProcessingModule( if (enable_typing_detection) EnableTypingDetection(audio_processing_.get()); - if (enable_aec && start_aec_dump) - StartAecDump(audio_processing_.get()); // Configure the audio format the audio processing is running on. This // has to be done after all the needed components are enabled. @@ -352,9 +348,6 @@ void MediaStreamAudioProcessor::StopAudioProcessing() { if (!audio_processing_.get()) return; - // It is safe to stop the AEC dump even it is not started. - StopAecDump(audio_processing_.get()); - audio_processing_.reset(); } diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index 8da7b14..d197b5d 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -660,8 +660,6 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { audio_device_ = audio_device; pc_factory_ = factory; webrtc::PeerConnectionFactoryInterface::Options factory_options; - factory_options.enable_aec_dump = - cmd_line->HasSwitch(switches::kEnableWebRtcAecRecordings); factory_options.disable_sctp_data_channels = cmd_line->HasSwitch(switches::kDisableSCTPDataChannels); factory_options.disable_encryption = diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc index f2d1fe9..04825c3 100644 --- a/content/renderer/p2p/ipc_socket_factory.cc +++ b/content/renderer/p2p/ipc_socket_factory.cc @@ -394,9 +394,9 @@ void IpcPacketSocket::OnDataReceived(const net::IPEndPoint& address, return; } - // TODO(mallinath) - Pass timestamp after updating the libjingle. - // talk_base::PacketTime packet_time(timestamp.ToInternalValue(), 0); - SignalReadPacket(this, &data[0], data.size(), address_lj); + talk_base::PacketTime packet_time(timestamp.ToInternalValue(), 0); + SignalReadPacket(this, &data[0], data.size(), address_lj, + packet_time); } } // namespace |