Switch stream creation and closing in Chrome audio rendering from IPC to Mojo

content/browser/renderer_host/media/audio_renderer_host.h

 // Copyright (c) 2012 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.
 //
 // AudioRendererHost serves audio related requests from AudioRenderer which
 // lives inside the render process and provide access to audio hardware.
 //
 // This class is owned by RenderProcessHostImpl, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread, so we
 // need to be extra careful about the lifetime of this object. AudioManager is a
@@ skipping 55 matching lines @@
 #include "url/origin.h"
 
 namespace media {
 class AudioManager;
 class AudioParameters;
 }
 
 namespace content {
 
 class AudioMirroringManager;
+class AudioOutputImpl;
 class MediaInternals;
 class MediaStreamManager;
 class MediaStreamUIProxy;
 class ResourceContext;
 
 class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
  public:
   // Called from UI thread from the owner of this object.
   AudioRendererHost(int render_process_id,
                     media::AudioManager* audio_manager,
                     AudioMirroringManager* mirroring_manager,
                     MediaInternals* media_internals,
                     MediaStreamManager* media_stream_manager,
                     const ResourceContext::SaltCallback& salt_callback);
 
+  // Creates an audio output stream with the specified format.
+  // Upon success/failure, the peer is notified via the NotifyStreamCreated
+  // message.
+  virtual void CreateStream(int stream_id,
+                            int render_frame_id,
+                            const media::AudioParameters& params,
+                            AudioOutputImpl* audio_output_impl);
+
+  // Close the audio stream referenced by |stream_id|.
+  virtual void CloseStream(int stream_id);
+
   // Calls |callback| with the list of AudioOutputControllers for this object.
   void GetOutputControllers(
       const RenderProcessHost::GetAudioOutputControllersCallback&
           callback) const;
+  media::AudioLog* get_audio_log() { return audio_log_.get(); }
 
   // BrowserMessageFilter implementation.
   void OnChannelClosing() override;
   void OnDestruct() const override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // Returns true if any streams managed by this host are actively playing.  Can
   // be called from any thread.
   bool HasActiveAudio();
 
   // Returns true if any streams managed by the RenderFrame identified by
   // |render_frame_id| are actively playing. Can be called from any thread.
   bool RenderFrameHasActiveAudio(int render_frame_id) const;
 
  private:
+  friend class AudioEntry;
+  friend class AudioOutputImplTest;
   friend class AudioRendererHostTest;
   friend class BrowserThread;
   friend class base::DeleteHelper<AudioRendererHost>;
   friend class MockAudioRendererHost;
+  friend class MockAudioOutputAudioRendererHost;
+  friend class MockAudioOutputStreamAudioRendererHost;
   friend class TestAudioRendererHost;
+
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, CreateMockStream);
   FRIEND_TEST_ALL_PREFIXES(AudioRendererHostTest, MockStreamDataConversation);
 
   class AudioEntry;
   typedef std::map<int, AudioEntry*> AudioEntryMap;
 
   // Internal callback type for access requests to output devices.
   // |have_access| is true only if there is permission to access the device.
   typedef base::Callback<void(bool have_access)> OutputDeviceAccessCB;
 
@@ skipping 17 matching lines @@
   // |session_id| will be ignored and the given |device_id| and
   // |security_origin| will be used to select the output device.
   // Upon completion of the process, the peer is notified with the device output
   // parameters via the NotifyDeviceAuthorized message.
   void OnRequestDeviceAuthorization(int stream_id,
                                     int render_frame_id,
                                     int session_id,
                                     const std::string& device_id,
                                     const url::Origin& security_origin);
 
-  // Creates an audio output stream with the specified format.
-  // Upon success/failure, the peer is notified via the NotifyStreamCreated
-  // message.
-  void OnCreateStream(int stream_id,
-                      int render_frame_id,
-                      const media::AudioParameters& params);
-
   // Play the audio stream referenced by |stream_id|.
   void OnPlayStream(int stream_id);
 
   // Pause the audio stream referenced by |stream_id|.
   void OnPauseStream(int stream_id);
 
-  // Close the audio stream referenced by |stream_id|.
-  void OnCloseStream(int stream_id);
-
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
   // Helper methods.
 
   // Proceed with device authorization after checking permissions.
   void OnDeviceAuthorized(int stream_id,
                           const std::string& device_id,
                           const url::Origin& security_origin,
                           bool have_access);
 
   // Proceed with device authorization after translating device ID.
   void OnDeviceIDTranslated(int stream_id,
                             bool device_found,
                             const AudioOutputDeviceInfo& device_info);
 
   // Start the actual creation of an audio stream, after the device
   // authorization process is complete.
-  void DoCreateStream(int stream_id,
-                      int render_frame_id,
-                      const media::AudioParameters& params,
-                      const std::string& device_unique_id);
+  virtual void DoCreateStream(int stream_id,
+                              int render_frame_id,
+                              const media::AudioParameters& params,
+                              const std::string& device_unique_id,
+                              AudioOutputImpl* audio_output_impl);
 
   // Complete the process of creating an audio stream. This will set up the
   // shared memory or shared socket in low latency mode and send the
   // NotifyStreamCreated message to the peer.
-  void DoCompleteCreation(int stream_id);
+  virtual void DoCompleteCreation(int stream_id);
 
   // Send playing/paused status to the renderer.
   void DoNotifyStreamStateChanged(int stream_id, bool is_playing);
 
   RenderProcessHost::AudioOutputControllerList DoGetOutputControllers() const;
 
   // Send an error message to the renderer.
   void SendErrorMessage(int stream_id);
 
   // Delete an audio entry, notifying observers first.  This is called by
   // AudioOutputController after it has closed.
   void DeleteEntry(std::unique_ptr<AudioEntry> entry);
 
-  // Send an error message to the renderer, then close the stream.
+  // Send an error message to the client, then close the stream.
   void ReportErrorAndClose(int stream_id);
 
   // A helper method to look up a AudioEntry identified by |stream_id|.
   // Returns NULL if not found.
   AudioEntry* LookupById(int stream_id);
 
   // A helper method to update the number of playing streams and alert the
   // ResourceScheduler when the renderer starts or stops playing an audiostream.
   void UpdateNumPlayingStreams(AudioEntry* entry, bool is_playing);
 
   // Check if the renderer process has access to the requested output device.
   void CheckOutputDeviceAccess(int render_frame_id,
                                const std::string& device_id,
                                const url::Origin& security_origin,
                                const OutputDeviceAccessCB& callback);
 
   // Invoke |callback| after permission to use a device has been checked.
   void AccessChecked(std::unique_ptr<MediaStreamUIProxy> ui_proxy,
                      const OutputDeviceAccessCB& callback,
                      bool have_access);
 
   // Translate the hashed |device_id| to a unique device ID.
   void TranslateDeviceID(const std::string& device_id,
                          const url::Origin& security_origin,
                          const OutputDeviceInfoCB& callback,
                          const AudioOutputDeviceEnumeration& enumeration);
 
   // Helper method to check if the authorization procedure for stream
-  // |stream_id| has started.
+  // |streaa_id| has started.

[nasko, 2016/05/25 20:50:42]

stream?

[rchtara, 2016/05/27 15:24:39]

Done.

   bool IsAuthorizationStarted(int stream_id);
 
   // ID of the RenderProcessHost that owns this instance.
   const int render_process_id_;
 
   media::AudioManager* const audio_manager_;
   AudioMirroringManager* const mirroring_manager_;
   std::unique_ptr<media::AudioLog> audio_log_;
+  std::map<int, int> renderer_frame_ids_;

[nasko, 2016/05/25 20:50:42]

This is never used.

[rchtara, 2016/05/27 15:24:39]

Done.

 
   // Used to access to AudioInputDeviceManager.
   MediaStreamManager* media_stream_manager_;
 
   // A map of stream IDs to audio sources.
   AudioEntryMap audio_entries_;
 
   // The number of streams in the playing state. Atomic read safe from any
   // thread, but should only be updated from the IO thread.
   base::AtomicRefCount num_playing_streams_;
@@ skipping 10 matching lines @@
   // The maximum number of simultaneous streams during the lifetime of this
   // host. Reported as UMA stat at shutdown.
   size_t max_simultaneous_streams_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_