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

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

Issue 14358049: Refactor AudioRendererMixer to be more generic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | 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 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 <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 17 matching lines...) Expand all
28 28
29 // AudioRendererSink implementation. 29 // AudioRendererSink implementation.
30 virtual void Start() OVERRIDE; 30 virtual void Start() OVERRIDE;
31 virtual void Stop() OVERRIDE; 31 virtual void Stop() OVERRIDE;
32 virtual void Play() OVERRIDE; 32 virtual void Play() OVERRIDE;
33 virtual void Pause() OVERRIDE; 33 virtual void Pause() OVERRIDE;
34 virtual bool SetVolume(double volume) OVERRIDE; 34 virtual bool SetVolume(double volume) OVERRIDE;
35 virtual void Initialize(const AudioParameters& params, 35 virtual void Initialize(const AudioParameters& params,
36 AudioRendererSink::RenderCallback* renderer) OVERRIDE; 36 AudioRendererSink::RenderCallback* renderer) OVERRIDE;
37 37
38 // Called by AudioRendererMixer when new delay information is available.
39 void set_audio_delay_milliseconds(int audio_delay_milliseconds) {
40 current_audio_delay_milliseconds_ = audio_delay_milliseconds;
41 }
42
43 // Called by AudioRendererMixer when an error occurs. 38 // Called by AudioRendererMixer when an error occurs.
44 void OnRenderError(); 39 void OnRenderError();
45 40
46 protected: 41 protected:
47 virtual ~AudioRendererMixerInput(); 42 virtual ~AudioRendererMixerInput();
48 43
49 private: 44 private:
50 friend class AudioRendererMixerInputTest; 45 friend class AudioRendererMixerInputTest;
51 46
52 bool playing_; 47 bool playing_;
(...skipping 12 matching lines...) Expand all
65 // AudioParameters received during Initialize(). 60 // AudioParameters received during Initialize().
66 AudioParameters params_; 61 AudioParameters params_;
67 62
68 // AudioRendererMixer provided through |get_mixer_cb_| during Initialize(), 63 // AudioRendererMixer provided through |get_mixer_cb_| during Initialize(),
69 // guaranteed to live (at least) until |remove_mixer_cb_| is called. 64 // guaranteed to live (at least) until |remove_mixer_cb_| is called.
70 AudioRendererMixer* mixer_; 65 AudioRendererMixer* mixer_;
71 66
72 // Source of audio data which is provided to the mixer. 67 // Source of audio data which is provided to the mixer.
73 AudioRendererSink::RenderCallback* callback_; 68 AudioRendererSink::RenderCallback* callback_;
74 69
75 // The current audio delay as last provided by AudioRendererMixer. 70 // Error callback for handing to AudioRendererMixer.
76 int current_audio_delay_milliseconds_; 71 base::Closure error_cb_;
77 72
78 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput); 73 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerInput);
79 }; 74 };
80 75
81 } // namespace media 76 } // namespace media
82 77
83 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_ 78 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698