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

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

Issue 1070923002: Fix incorrect AudioConverter setup for discrete channel layouts. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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') | no next file » | 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_audio_delay_milliseconds_(-1),
18 last_channel_count_(-1),
18 volume_(1) { 19 volume_(1) {
19 reset(); 20 reset();
20 } 21 }
21 22
22 FakeAudioRenderCallback::~FakeAudioRenderCallback() {} 23 FakeAudioRenderCallback::~FakeAudioRenderCallback() {}
23 24
24 int FakeAudioRenderCallback::Render(AudioBus* audio_bus, 25 int FakeAudioRenderCallback::Render(AudioBus* audio_bus,
25 int audio_delay_milliseconds) { 26 int audio_delay_milliseconds) {
26 last_audio_delay_milliseconds_ = audio_delay_milliseconds; 27 last_audio_delay_milliseconds_ = audio_delay_milliseconds;
28 last_channel_count_ = audio_bus->channels();
29
27 int number_of_frames = audio_bus->frames(); 30 int number_of_frames = audio_bus->frames();
28 if (half_fill_) 31 if (half_fill_)
29 number_of_frames /= 2; 32 number_of_frames /= 2;
30 33
31 // Fill first channel with a sine wave. 34 // Fill first channel with a sine wave.
32 for (int i = 0; i < number_of_frames; ++i) 35 for (int i = 0; i < number_of_frames; ++i)
33 audio_bus->channel(0)[i] = sin(2 * M_PI * (x_ + step_ * i)); 36 audio_bus->channel(0)[i] = sin(2 * M_PI * (x_ + step_ * i));
34 x_ += number_of_frames * step_; 37 x_ += number_of_frames * step_;
35 38
36 // Copy first channel into the rest of the channels. 39 // Copy first channel into the rest of the channels.
37 for (int i = 1; i < audio_bus->channels(); ++i) 40 for (int i = 1; i < audio_bus->channels(); ++i)
38 memcpy(audio_bus->channel(i), audio_bus->channel(0), 41 memcpy(audio_bus->channel(i), audio_bus->channel(0),
39 number_of_frames * sizeof(*audio_bus->channel(i))); 42 number_of_frames * sizeof(*audio_bus->channel(i)));
40 43
41 return number_of_frames; 44 return number_of_frames;
42 } 45 }
43 46
44 double FakeAudioRenderCallback::ProvideInput(AudioBus* audio_bus, 47 double FakeAudioRenderCallback::ProvideInput(AudioBus* audio_bus,
45 base::TimeDelta buffer_delay) { 48 base::TimeDelta buffer_delay) {
46 Render(audio_bus, buffer_delay.InMillisecondsF() + 0.5); 49 Render(audio_bus, buffer_delay.InMillisecondsF() + 0.5);
47 return volume_; 50 return volume_;
48 } 51 }
49 52
50 } // namespace media 53 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_audio_render_callback.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698