Add AudioStreamRegistry. Move stream counting logic

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 47 matching lines @@
 }
 
 namespace media {
 class AudioManager;
 class AudioParameters;
 }
 
 namespace content {
 
 class AudioMirroringManager;
+class AudioStreamRegistry;
 class MediaStreamManager;
 
 class CONTENT_EXPORT AudioRendererHost
     : public BrowserMessageFilter,
       public AudioOutputDelegate::EventHandler {
  public:
   // Called from UI thread from the owner of this object.
   AudioRendererHost(int render_process_id,
+                    AudioStreamRegistry* stream_registry,
                     media::AudioManager* audio_manager,
                     AudioMirroringManager* mirroring_manager,
                     MediaStreamManager* media_stream_manager,
                     const std::string& salt);
 
   // Calls |callback| with the list of AudioOutputControllers for this object.
   void GetOutputControllers(
       const RenderProcessHost::GetAudioOutputControllersCallback&
           callback) const;
 
   // BrowserMessageFilter implementation.
   void OnChannelClosing() override;
   void OnDestruct() const override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // AudioOutputDelegate::EventHandler implementation
   void OnStreamCreated(int stream_id,
                        base::SharedMemory* shared_memory,
                        base::CancelableSyncSocket* foreign_socket) override;
   void OnStreamError(int stream_id) override;
-  void OnStreamStateChanged(bool is_playing) override;
 
   // Returns true if any streams managed by this host are actively playing.  Can
   // be called from any thread.
   bool HasActiveAudio();
 
   void OverrideDevicePermissionsForTesting(bool has_access);
 
  private:
   friend class AudioRendererHostTest;
   friend class BrowserThread;
@@ skipping 63 matching lines @@
 
   // Set the volume of the audio stream referenced by |stream_id|.
   void OnSetVolume(int stream_id, double volume);
 
   // Helper methods.
 
   // Called after the |render_frame_id| provided to OnCreateStream() was
   // validated. When |is_valid| is false, this calls OnStreamError().
   void DidValidateRenderFrame(int stream_id, bool is_valid);
 
-  // Updates status of stream for AudioStreamMonitor and updates
-  // the number of playing streams.
-  void StreamStateChanged(int stream_id, bool is_playing);
-
   RenderProcessHost::AudioOutputControllerList DoGetOutputControllers() const;
 
   // Send an error message to the renderer.
   void SendErrorMessage(int stream_id);
 
   // Helper methods to look up a AudioOutputDelegate identified by |stream_id|.
   // Returns delegates_.end() if not found.
   AudioOutputDelegateVector::iterator LookupIteratorById(int stream_id);
   // Returns nullptr if not found.
   AudioOutputDelegate* LookupById(int stream_id);
 
   // Helper method to check if the authorization procedure for stream
   // |stream_id| has started.
   bool IsAuthorizationStarted(int stream_id);
 
   // Called from AudioRendererHostTest to override the function that checks for
   // the existence of the RenderFrameHost at stream creation time.
   void set_render_frame_id_validate_function_for_testing(
       ValidateRenderFrameIdFunction function) {
     validate_render_frame_id_function_ = function;
   }
 
   // ID of the RenderProcessHost that owns this instance.
   const int render_process_id_;
 
+  AudioStreamRegistry* stream_registry_;
   media::AudioManager* const audio_manager_;
   AudioMirroringManager* const mirroring_manager_;
 
   // Used to access to AudioInputDeviceManager.
   MediaStreamManager* media_stream_manager_;
 
   // A list of the current open streams.
   AudioOutputDelegateVector delegates_;
 
-  // 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_;
-
   // Salt required to translate renderer device IDs to raw device unique IDs
   std::string salt_;
 
   // Map of device authorizations for streams that are not yet created
   // The key is the stream ID, and the value is a pair. The pair's first element
   // is a bool that is true if the authorization process completes successfully.
   // The second element contains the unique ID of the authorized device.
   std::map<int, std::pair<bool, std::string>> authorizations_;
 
   // At stream creation time, AudioRendererHost will call this function on the
   // UI thread to validate render frame IDs. A default is set by the
   // constructor, but this can be overridden by unit tests.
   ValidateRenderFrameIdFunction validate_render_frame_id_function_;
 
-  // The maximum number of simultaneous streams during the lifetime of this
-  // host. Reported as UMA stat at shutdown.
-  size_t max_simultaneous_streams_;
-
   AudioOutputAuthorizationHandler authorization_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_RENDERER_HOST_H_