Support multiple files for AEC dump.

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 150 matching lines @@
   blink::WebFrame* web_frame_;
 };
 
 PeerConnectionDependencyFactory::PeerConnectionDependencyFactory(
     P2PSocketDispatcher* p2p_socket_dispatcher)
     : network_manager_(NULL),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       signaling_thread_(NULL),
       worker_thread_(NULL),
       chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
+  if (!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()) {
+    aec_dump_message_filter_ = AecDumpMessageFilter::Get();
+    DCHECK(aec_dump_message_filter_);
+    aec_dump_message_filter_->SetObserver(this);
+  }
 }
 
 PeerConnectionDependencyFactory::~PeerConnectionDependencyFactory() {
   CleanupPeerConnectionFactory();
+  if (aec_dump_message_filter_)
+    aec_dump_message_filter_->SetObserver(NULL);
 }
 
 blink::WebRTCPeerConnectionHandler*
 PeerConnectionDependencyFactory::CreateRTCPeerConnectionHandler(
     blink::WebRTCPeerConnectionHandlerClient* client) {
   // Save histogram data so we can see how much PeerConnetion is used.
   // The histogram counts the number of calls to the JS API
   // webKitRTCPeerConnection.
   UpdateWebRTCMethodCount(WEBKIT_RTC_PEER_CONNECTION);
 
@@ skipping 155 matching lines @@
                                           decoder_factory.release()));
   CHECK(factory);
 
   pc_factory_ = factory;
   webrtc::PeerConnectionFactoryInterface::Options factory_options;
   factory_options.disable_sctp_data_channels = false;
   factory_options.disable_encryption =
       cmd_line->HasSwitch(switches::kDisableWebRtcEncryption);
   pc_factory_->SetOptions(factory_options);
 
-  // |aec_dump_file| will be invalid when dump is not enabled.
-  if (aec_dump_file_.IsValid())
-    StartAecDump(aec_dump_file_.Pass());
+  // TODO(xians): Remove the following code after kDisableAudioTrackProcessing
+  // is removed.
+  if (!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled() &&
+      aec_dump_message_filter_) {
+    // There's only one AEC dump if not using track processing, we use ID 0.
+    // PCDF lives as long as the renderer lives, so we don't need to unregister.
+    aec_dump_message_filter_->io_message_loop()->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &AecDumpMessageFilter::RegisterAecDumpConsumer,
+            aec_dump_message_filter_,
+            0));
+  }
 }
 
 bool PeerConnectionDependencyFactory::PeerConnectionFactoryCreated() {
   return pc_factory_.get() != NULL;
 }
 
 scoped_refptr<webrtc::PeerConnectionInterface>
 PeerConnectionDependencyFactory::CreatePeerConnection(
     const webrtc::PeerConnectionInterface::IceServers& ice_servers,
     const webrtc::MediaConstraintsInterface* constraints,
@@ skipping 242 matching lines @@
           static_cast<webrtc::AudioTrackInterface*>(native_track),
           is_local_track));
 }
 
 scoped_refptr<base::MessageLoopProxy>
 PeerConnectionDependencyFactory::GetWebRtcWorkerThread() const {
   DCHECK(CalledOnValidThread());
   return chrome_worker_thread_.message_loop_proxy();
 }
 
-bool PeerConnectionDependencyFactory::OnControlMessageReceived(
-    const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(PeerConnectionDependencyFactory, message)
-    IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile)
-    IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
+void PeerConnectionDependencyFactory::OnAecDumpFile(
+    int id,
+    const IPC::PlatformFileForTransit& file_handle) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled());
+  DCHECK(PeerConnectionFactoryCreated());
+  DCHECK(id == 0) << id;
 
-void PeerConnectionDependencyFactory::OnAecDumpFile(
-    IPC::PlatformFileForTransit file_handle) {
-  DCHECK(!aec_dump_file_.IsValid());
   base::File file = IPC::PlatformFileForTransitToFile(file_handle);
   DCHECK(file.IsValid());
 
-  if (MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()) {
-    EnsureWebRtcAudioDeviceImpl();
-    GetWebRtcAudioDevice()->EnableAecDump(file.Pass());
-    return;
-  }
-
-  // TODO(xians): Remove the following code after kDisableAudioTrackProcessing
-  // is removed.
-  if (PeerConnectionFactoryCreated())
-    StartAecDump(file.Pass());
-  else
-    aec_dump_file_ = file.Pass();
+  // |pc_factory_| always takes ownership of |aec_dump_file|. If StartAecDump()
+  // fails, |aec_dump_file| will be closed.
+  if (!GetPcFactory()->StartAecDump(file.TakePlatformFile()))
+    VLOG(1) << "Could not start AEC dump.";
 }
 
 void PeerConnectionDependencyFactory::OnDisableAecDump() {
-  if (MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()) {
-    // Do nothing if OnAecDumpFile() has never been called.
-    if (GetWebRtcAudioDevice())
-      GetWebRtcAudioDevice()->DisableAecDump();
-    return;
-  }
-
-  // TODO(xians): Remove the following code after kDisableAudioTrackProcessing
-  // is removed.
-  if (aec_dump_file_.IsValid())
-    aec_dump_file_.Close();
+  DCHECK(CalledOnValidThread());
+  DCHECK(!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled());
+  // Do nothing. We never disable AEC dump for non-track-processing case.
 }
 
-void PeerConnectionDependencyFactory::StartAecDump(base::File aec_dump_file) {
-  // |pc_factory_| always takes ownership of |aec_dump_file|. If StartAecDump()
-  // fails, |aec_dump_file| will be closed.
-  if (!GetPcFactory()->StartAecDump(aec_dump_file.TakePlatformFile()))
-    VLOG(1) << "Could not start AEC dump.";
+void PeerConnectionDependencyFactory::OnIpcClosed() {
+  DCHECK(CalledOnValidThread());
+  aec_dump_message_filter_ = NULL;
 }
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_)
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content