| Index: media/base/fake_audio_render_callback.h
|
| diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h
|
| index 5e2a600bfab099d8903663384fac2f96e79f1812..c62be38780927ed4e61ba1323cdcd26f9fb2e30b 100644
|
| --- a/media/base/fake_audio_render_callback.h
|
| +++ b/media/base/fake_audio_render_callback.h
|
| @@ -24,7 +24,7 @@ class FakeAudioRenderCallback
|
| // The function used to fulfill Render() is f(x) = sin(2 * PI * x * |step|),
|
| // where x = [|number_of_frames| * m, |number_of_frames| * (m + 1)] and m =
|
| // the number of Render() calls fulfilled thus far.
|
| - explicit FakeAudioRenderCallback(double step);
|
| + FakeAudioRenderCallback(double step, int sample_rate);
|
| ~FakeAudioRenderCallback() override;
|
|
|
| // Renders a sine wave into the provided audio data buffer. If |half_fill_|
|
| @@ -44,9 +44,9 @@ class FakeAudioRenderCallback
|
| // Reset the sine state to initial value.
|
| void reset() { x_ = 0; }
|
|
|
| - // Returns the last |frames_delayed| provided to Render() or -1 if
|
| - // no Render() call occurred.
|
| - int last_frames_delayed() const { return last_frames_delayed_; }
|
| + // Returns the last |delay| provided to Render() or base::TimeDelta::Max()
|
| + // if no Render() call occurred.
|
| + base::TimeDelta last_delay() const { return last_delay_; }
|
|
|
| // Set volume information used by ProvideAudioTransformInput().
|
| void set_volume(double volume) { volume_ = volume; }
|
| @@ -54,16 +54,15 @@ class FakeAudioRenderCallback
|
| int last_channel_count() const { return last_channel_count_; }
|
|
|
| private:
|
| - int RenderInternal(AudioBus* audio_bus,
|
| - uint32_t frames_delayed,
|
| - double volume);
|
| + int RenderInternal(AudioBus* audio_bus, base::TimeDelta delay, double volume);
|
|
|
| bool half_fill_;
|
| double x_;
|
| double step_;
|
| - int last_frames_delayed_;
|
| + base::TimeDelta last_delay_;
|
| int last_channel_count_;
|
| double volume_;
|
| + int sample_rate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakeAudioRenderCallback);
|
| };
|
|
|