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

Side by Side Diff: media/base/audio_renderer_mixer_input.h

Issue 1122393004: Add support for switching the audio output device for HTMLMediaElements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes to MediaPlayers so that they invoke callbacks in the correct threads. First complete implem… Created 5 years, 6 months 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
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 MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
7 7
8 #include <string>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "media/base/audio_converter.h" 12 #include "media/base/audio_converter.h"
12 #include "media/base/audio_renderer_sink.h" 13 #include "media/base/audio_renderer_sink.h"
14 #include "url/gurl.h"
13 15
14 namespace media { 16 namespace media {
15 17
16 class AudioRendererMixer; 18 class AudioRendererMixer;
17 19
18 class MEDIA_EXPORT AudioRendererMixerInput 20 class MEDIA_EXPORT AudioRendererMixerInput
19 : NON_EXPORTED_BASE(public AudioRendererSink), 21 : NON_EXPORTED_BASE(public AudioRendererSink),
20 public AudioConverter::InputCallback { 22 public AudioConverter::InputCallback {
21 public: 23 public:
22 typedef base::Callback<AudioRendererMixer*( 24 typedef base::Callback<AudioRendererMixer*(
23 const AudioParameters& params)> GetMixerCB; 25 const AudioParameters& params)> GetMixerCB;
24 typedef base::Callback<void(const AudioParameters& params)> RemoveMixerCB; 26 typedef base::Callback<void(const AudioParameters& params)> RemoveMixerCB;
25 27
26 AudioRendererMixerInput( 28 AudioRendererMixerInput(
27 const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb); 29 const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb);
28 30
29 // AudioRendererSink implementation. 31 // AudioRendererSink implementation.
30 void Start() override; 32 void Start() override;
31 void Stop() override; 33 void Stop() override;
32 void Play() override; 34 void Play() override;
33 void Pause() override; 35 void Pause() override;
34 bool SetVolume(double volume) override; 36 bool SetVolume(double volume) override;
37 void SwitchOutputDevice(const std::string& device_id,
38 const GURL& security_origin,
39 const base::Callback<void(int)>& callback) override;
35 void Initialize(const AudioParameters& params, 40 void Initialize(const AudioParameters& params,
36 AudioRendererSink::RenderCallback* renderer) override; 41 AudioRendererSink::RenderCallback* renderer) override;
37 42
38 // Called by AudioRendererMixer when an error occurs. 43 // Called by AudioRendererMixer when an error occurs.
39 void OnRenderError(); 44 void OnRenderError();
40 45
41 protected: 46 protected:
42 ~AudioRendererMixerInput() override; 47 ~AudioRendererMixerInput() override;
43 48
44 private: 49 private:
(...skipping 24 matching lines...) Expand all
69 74
70 // Error callback for handing to AudioRendererMixer. 75 // Error callback for handing to AudioRendererMixer.
71 const base::Closure error_cb_; 76 const base::Closure error_cb_;
72 77
73 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput); 78 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput);
74 }; 79 };
75 80
76 } // namespace media 81 } // namespace media
77 82
78 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 83 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698