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

Side by Side Diff: media/base/fake_audio_render_callback.cc

Issue 2004283002: AudioConverter: Express delay in frames rather than msec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed files & removed rounding Created 4 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/fake_audio_render_callback.h ('k') | media/base/fake_audio_renderer_sink.h » ('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 // MSVC++ requires this to be set before any other includes to get M_PI. 5 // MSVC++ requires this to be set before any other includes to get M_PI.
6 #define _USE_MATH_DEFINES 6 #define _USE_MATH_DEFINES
7 7
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "media/base/fake_audio_render_callback.h" 10 #include "media/base/fake_audio_render_callback.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 FakeAudioRenderCallback::FakeAudioRenderCallback(double step) 14 FakeAudioRenderCallback::FakeAudioRenderCallback(double step)
15 : half_fill_(false), 15 : half_fill_(false),
16 step_(step), 16 step_(step),
17 last_audio_delay_milliseconds_(-1), 17 last_frames_delayed_(-1),
18 last_channel_count_(-1), 18 last_channel_count_(-1),
19 volume_(1) { 19 volume_(1) {
20 reset(); 20 reset();
21 } 21 }
22 22
23 FakeAudioRenderCallback::~FakeAudioRenderCallback() {} 23 FakeAudioRenderCallback::~FakeAudioRenderCallback() {}
24 24
25 int FakeAudioRenderCallback::Render(AudioBus* audio_bus, 25 int FakeAudioRenderCallback::Render(AudioBus* audio_bus,
26 uint32_t audio_delay_milliseconds, 26 uint32_t frames_delayed,
27 uint32_t frames_skipped) { 27 uint32_t frames_skipped) {
28 last_audio_delay_milliseconds_ = audio_delay_milliseconds; 28 DCHECK_LE(frames_delayed, static_cast<uint32_t>(INT_MAX));
29 last_frames_delayed_ = static_cast<int>(frames_delayed);
30
29 last_channel_count_ = audio_bus->channels(); 31 last_channel_count_ = audio_bus->channels();
30 32
31 int number_of_frames = audio_bus->frames(); 33 int number_of_frames = audio_bus->frames();
32 if (half_fill_) 34 if (half_fill_)
33 number_of_frames /= 2; 35 number_of_frames /= 2;
34 36
35 // Fill first channel with a sine wave. 37 // Fill first channel with a sine wave.
36 for (int i = 0; i < number_of_frames; ++i) 38 for (int i = 0; i < number_of_frames; ++i)
37 audio_bus->channel(0)[i] = sin(2 * M_PI * (x_ + step_ * i)); 39 audio_bus->channel(0)[i] = sin(2 * M_PI * (x_ + step_ * i));
38 x_ += number_of_frames * step_; 40 x_ += number_of_frames * step_;
39 41
40 // Copy first channel into the rest of the channels. 42 // Copy first channel into the rest of the channels.
41 for (int i = 1; i < audio_bus->channels(); ++i) 43 for (int i = 1; i < audio_bus->channels(); ++i)
42 memcpy(audio_bus->channel(i), audio_bus->channel(0), 44 memcpy(audio_bus->channel(i), audio_bus->channel(0),
43 number_of_frames * sizeof(*audio_bus->channel(i))); 45 number_of_frames * sizeof(*audio_bus->channel(i)));
44 46
45 return number_of_frames; 47 return number_of_frames;
46 } 48 }
47 49
48 double FakeAudioRenderCallback::ProvideInput(AudioBus* audio_bus, 50 double FakeAudioRenderCallback::ProvideInput(AudioBus* audio_bus,
49 base::TimeDelta buffer_delay) { 51 uint32_t frames_delayed) {
50 Render(audio_bus, buffer_delay.InMillisecondsF() + 0.5, 0); 52 Render(audio_bus, frames_delayed, 0);
51 return volume_; 53 return volume_;
52 } 54 }
53 55
54 } // namespace media 56 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_audio_render_callback.h ('k') | media/base/fake_audio_renderer_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698