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

Side by Side Diff: media/audio/audio_output_stream_sink.cc

Issue 2101303004: Pass delay and timestamp to AudioSourceCallback::OnMoreData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "media/audio/audio_output_stream_sink.h" 5 #include "media/audio/audio_output_stream_sink.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 return OutputDeviceInfo(); 77 return OutputDeviceInfo();
78 } 78 }
79 79
80 bool AudioOutputStreamSink::CurrentThreadIsRenderingThread() { 80 bool AudioOutputStreamSink::CurrentThreadIsRenderingThread() {
81 NOTIMPLEMENTED(); 81 NOTIMPLEMENTED();
82 return false; 82 return false;
83 } 83 }
84 84
85 int AudioOutputStreamSink::OnMoreData(AudioBus* dest, 85 int AudioOutputStreamSink::OnMoreData(AudioBus* dest,
86 uint32_t total_bytes_delay, 86 uint32_t total_bytes_delay,
87 base::TimeDelta delay_timestamp,
87 uint32_t frames_skipped) { 88 uint32_t frames_skipped) {
88 // Note: Runs on the audio thread created by the OS. 89 // Note: Runs on the audio thread created by the OS.
89 base::AutoLock al(callback_lock_); 90 base::AutoLock al(callback_lock_);
90 if (!active_render_callback_) 91 if (!active_render_callback_)
91 return 0; 92 return 0;
92 93
93 uint32_t frames_delayed = std::round(static_cast<double>(total_bytes_delay) / 94 uint32_t frames_delayed = std::round(static_cast<double>(total_bytes_delay) /
94 active_params_.GetBytesPerFrame()); 95 active_params_.GetBytesPerFrame());
95 96
96 return active_render_callback_->Render(dest, frames_delayed, frames_skipped); 97 return active_render_callback_->Render(dest, frames_delayed, frames_skipped);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void AudioOutputStreamSink::DoSetVolume(double volume) { 148 void AudioOutputStreamSink::DoSetVolume(double volume) {
148 DCHECK(audio_task_runner_->BelongsToCurrentThread()); 149 DCHECK(audio_task_runner_->BelongsToCurrentThread());
149 stream_->SetVolume(volume); 150 stream_->SetVolume(volume);
150 } 151 }
151 152
152 void AudioOutputStreamSink::ClearCallback() { 153 void AudioOutputStreamSink::ClearCallback() {
153 base::AutoLock al(callback_lock_); 154 base::AutoLock al(callback_lock_);
154 active_render_callback_ = NULL; 155 active_render_callback_ = NULL;
155 } 156 }
156 157
157 } // namepace media 158 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698