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

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

Issue 1186943003: Revert of Add support for the audio-output-device switching IPC mechanism to the renderer lower... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/base/audio_renderer_mixer.cc ('k') | media/base/audio_renderer_mixer_input.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
9 #include <vector> 8 #include <vector>
10 9
11 #include "base/callback.h" 10 #include "base/callback.h"
12 #include "media/base/audio_converter.h" 11 #include "media/base/audio_converter.h"
13 #include "media/base/audio_renderer_sink.h" 12 #include "media/base/audio_renderer_sink.h"
14 13
15 namespace media { 14 namespace media {
16 15
17 class AudioRendererMixer; 16 class AudioRendererMixer;
18 17
19 class MEDIA_EXPORT AudioRendererMixerInput 18 class MEDIA_EXPORT AudioRendererMixerInput
20 : NON_EXPORTED_BASE(public AudioRendererSink), 19 : NON_EXPORTED_BASE(public AudioRendererSink),
21 public AudioConverter::InputCallback { 20 public AudioConverter::InputCallback {
22 public: 21 public:
23 typedef base::Callback<AudioRendererMixer*( 22 typedef base::Callback<AudioRendererMixer*(
24 const AudioParameters& params)> GetMixerCB; 23 const AudioParameters& params)> GetMixerCB;
25 typedef base::Callback<void(const AudioParameters& params)> RemoveMixerCB; 24 typedef base::Callback<void(const AudioParameters& params)> RemoveMixerCB;
26 25
27 AudioRendererMixerInput( 26 AudioRendererMixerInput(
28 const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb); 27 const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb);
29 28
30 // AudioRendererSink implementation. 29 // AudioRendererSink implementation.
31 void Start() override; 30 void Start() override;
32 void Stop() override; 31 void Stop() override;
33 void Play() override; 32 void Play() override;
34 void Pause() override; 33 void Pause() override;
35 bool SetVolume(double volume) override; 34 bool SetVolume(double volume) override;
36 void SwitchOutputDevice(const std::string& device_id,
37 const GURL& security_origin,
38 const SwitchOutputDeviceCB& callback) override;
39 void Initialize(const AudioParameters& params, 35 void Initialize(const AudioParameters& params,
40 AudioRendererSink::RenderCallback* renderer) override; 36 AudioRendererSink::RenderCallback* renderer) override;
41 37
42 // Called by AudioRendererMixer when an error occurs. 38 // Called by AudioRendererMixer when an error occurs.
43 void OnRenderError(); 39 void OnRenderError();
44 40
45 protected: 41 protected:
46 ~AudioRendererMixerInput() override; 42 ~AudioRendererMixerInput() override;
47 43
48 private: 44 private:
(...skipping 24 matching lines...) Expand all
73 69
74 // Error callback for handing to AudioRendererMixer. 70 // Error callback for handing to AudioRendererMixer.
75 const base::Closure error_cb_; 71 const base::Closure error_cb_;
76 72
77 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput); 73 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput);
78 }; 74 };
79 75
80 } // namespace media 76 } // namespace media
81 77
82 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 78 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
OLDNEW
« no previous file with comments | « media/base/audio_renderer_mixer.cc ('k') | media/base/audio_renderer_mixer_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698