Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Side by Side Diff: content/renderer/media/audio_renderer_mixer_manager.h

Issue 11359196: Associate audio streams with their source/destination RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Plus, removed CalledOnValidThread DCHECK from sampleRate() call since nothing mutates. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
6 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 6 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "media/audio/audio_parameters.h" 12 #include "media/audio/audio_parameters.h"
13 13
14 namespace media { 14 namespace media {
15 class AudioRendererMixer; 15 class AudioRendererMixer;
16 class AudioRendererMixerInput; 16 class AudioRendererMixerInput;
17 class AudioRendererSink;
17 } 18 }
18 19
19 namespace content { 20 namespace content {
20 21
21 // Manages sharing of an AudioRendererMixer among AudioRendererMixerInputs based 22 // Manages sharing of an AudioRendererMixer among AudioRendererMixerInputs based
22 // on their AudioParameters configuration. Inputs with the same AudioParameters 23 // on their AudioParameters configuration. Inputs with the same AudioParameters
23 // configuration will share a mixer while a new AudioRendererMixer will be 24 // configuration will share a mixer while a new AudioRendererMixer will be
24 // lazily created if one with the exact AudioParameters does not exist. 25 // lazily created if one with the exact AudioParameters does not exist.
25 // 26 //
26 // There should only be one instance of AudioRendererMixerManager per render 27 // There should only be one instance of AudioRendererMixerManager per render
(...skipping 11 matching lines...) Expand all
38 ~AudioRendererMixerManager(); 39 ~AudioRendererMixerManager();
39 40
40 // Creates an AudioRendererMixerInput with the proper callbacks necessary to 41 // Creates an AudioRendererMixerInput with the proper callbacks necessary to
41 // retrieve an AudioRendererMixer instance from AudioRendererMixerManager. 42 // retrieve an AudioRendererMixer instance from AudioRendererMixerManager.
42 // Caller must ensure AudioRendererMixerManager outlives the returned input. 43 // Caller must ensure AudioRendererMixerManager outlives the returned input.
43 media::AudioRendererMixerInput* CreateInput(); 44 media::AudioRendererMixerInput* CreateInput();
44 45
45 private: 46 private:
46 friend class AudioRendererMixerManagerTest; 47 friend class AudioRendererMixerManagerTest;
47 48
49 // Overrides the AudioRendererSink implementation for unit testing.
50 void SetAudioRendererSinkForTesting(media::AudioRendererSink* sink);
51
48 // Returns a mixer instance based on AudioParameters; an existing one if one 52 // Returns a mixer instance based on AudioParameters; an existing one if one
49 // with the provided AudioParameters exists or a new one if not. 53 // with the provided AudioParameters exists or a new one if not.
50 media::AudioRendererMixer* GetMixer(const media::AudioParameters& params); 54 media::AudioRendererMixer* GetMixer(const media::AudioParameters& params);
51 55
52 // Remove a mixer instance given a mixer if the only other reference is held 56 // Remove a mixer instance given a mixer if the only other reference is held
53 // by AudioRendererMixerManager. Every AudioRendererMixer owner must call 57 // by AudioRendererMixerManager. Every AudioRendererMixer owner must call
54 // this method when it's done with a mixer. 58 // this method when it's done with a mixer.
55 void RemoveMixer(const media::AudioParameters& params); 59 void RemoveMixer(const media::AudioParameters& params);
56 60
57 // Map of AudioParameters to <AudioRendererMixer, Count>. Count allows 61 // Map of AudioParameters to <AudioRendererMixer, Count>. Count allows
58 // AudioRendererMixerManager to keep track explicitly (v.s. RefCounted which 62 // AudioRendererMixerManager to keep track explicitly (v.s. RefCounted which
59 // is implicit) of the number of outstanding AudioRendererMixers. 63 // is implicit) of the number of outstanding AudioRendererMixers.
60 struct AudioRendererMixerReference { 64 struct AudioRendererMixerReference {
61 media::AudioRendererMixer* mixer; 65 media::AudioRendererMixer* mixer;
62 int ref_count; 66 int ref_count;
63 }; 67 };
64 typedef std::map<media::AudioParameters, 68 typedef std::map<media::AudioParameters,
65 AudioRendererMixerReference> AudioRendererMixerMap; 69 AudioRendererMixerReference> AudioRendererMixerMap;
66 AudioRendererMixerMap mixers_; 70 AudioRendererMixerMap mixers_;
67 base::Lock mixers_lock_; 71 base::Lock mixers_lock_;
68 72
69 // Audio hardware configuration. Used to construct output AudioParameters for 73 // Audio hardware configuration. Used to construct output AudioParameters for
70 // each AudioRendererMixer instance. 74 // each AudioRendererMixer instance.
71 int hardware_sample_rate_; 75 int hardware_sample_rate_;
72 int hardware_buffer_size_; 76 int hardware_buffer_size_;
73 77
78 media::AudioRendererSink* sink_for_testing_;
79
74 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager); 80 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
75 }; 81 };
76 82
77 } // namespace content 83 } // namespace content
78 84
79 #endif // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_ 85 #endif // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/audio_message_filter.cc ('k') | content/renderer/media/audio_renderer_mixer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698