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

Unified Diff: media/base/audio_bus.cc

Issue 2640003002: Implement MojoAudioRendererSink and use it in UtilityMojoMediaClient (Closed)
Patch Set: Rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_bus.h ('k') | media/base/ipc/media_param_traits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_bus.cc
diff --git a/media/base/audio_bus.cc b/media/base/audio_bus.cc
index d261e87f8dc9f26ae29338b874343eebf728f275..49589c5bf01dc8dd2612ce318f7a60478bd4e0d5 100644
--- a/media/base/audio_bus.cc
+++ b/media/base/audio_bus.cc
@@ -62,34 +62,33 @@ void AudioBus::CheckOverflow(int start_frame, int frames, int total_frames) {
}
AudioBus::AudioBus(int channels, int frames)
- : frames_(frames),
- can_set_channel_data_(false) {
+ : data_size_(0), frames_(frames), can_set_channel_data_(false) {
ValidateConfig(channels, frames_);
int aligned_frames = 0;
- int size = CalculateMemorySizeInternal(channels, frames, &aligned_frames);
+ data_size_ = CalculateMemorySizeInternal(channels, frames, &aligned_frames);
- data_.reset(static_cast<float*>(base::AlignedAlloc(
- size, AudioBus::kChannelAlignment)));
+ data_.reset(static_cast<float*>(
+ base::AlignedAlloc(data_size_, AudioBus::kChannelAlignment)));
BuildChannelData(channels, aligned_frames, data_.get());
}
AudioBus::AudioBus(int channels, int frames, float* data)
- : frames_(frames),
- can_set_channel_data_(false) {
+ : data_size_(0), frames_(frames), can_set_channel_data_(false) {
// Since |data| may have come from an external source, ensure it's valid.
CHECK(data);
ValidateConfig(channels, frames_);
int aligned_frames = 0;
- CalculateMemorySizeInternal(channels, frames, &aligned_frames);
+ data_size_ = CalculateMemorySizeInternal(channels, frames, &aligned_frames);
BuildChannelData(channels, aligned_frames, data);
}
AudioBus::AudioBus(int frames, const std::vector<float*>& channel_data)
- : channel_data_(channel_data),
+ : data_size_(0),
+ channel_data_(channel_data),
frames_(frames),
can_set_channel_data_(false) {
ValidateConfig(
@@ -101,7 +100,8 @@ AudioBus::AudioBus(int frames, const std::vector<float*>& channel_data)
}
AudioBus::AudioBus(int channels)
- : channel_data_(channels),
+ : data_size_(0),
+ channel_data_(channels),
frames_(0),
can_set_channel_data_(true) {
CHECK_GT(channels, 0);
« no previous file with comments | « media/base/audio_bus.h ('k') | media/base/ipc/media_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698