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

Unified Diff: media/audio/null_audio_sink.cc

Issue 10837032: Fix playback rate w/o audio. Remove unused SetPlaybackRate(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/null_audio_sink.h ('k') | media/base/audio_renderer_sink.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/null_audio_sink.cc
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc
index 6c164645918ae4eede6c305359773fc34998cc51..d98aa6397a77a63bc87e546923aec462f641fb08 100644
--- a/media/audio/null_audio_sink.cc
+++ b/media/audio/null_audio_sink.cc
@@ -13,7 +13,6 @@ namespace media {
NullAudioSink::NullAudioSink()
: initialized_(false),
- playback_rate_(0.0),
playing_(false),
callback_(NULL),
thread_("NullAudioThread"),
@@ -62,11 +61,6 @@ void NullAudioSink::Pause(bool /* flush */) {
SetPlaying(false);
}
-void NullAudioSink::SetPlaybackRate(float rate) {
- base::AutoLock auto_lock(lock_);
- playback_rate_ = rate;
-}
-
bool NullAudioSink::SetVolume(double volume) {
// Audio is always muted.
return volume == 0.0;
@@ -89,7 +83,6 @@ void NullAudioSink::FillBufferTask() {
base::TimeDelta delay;
// Only consume buffers when actually playing.
if (playing_) {
- DCHECK_GT(playback_rate_, 0.0f);
int requested_frames = params_.frames_per_buffer();
int frames_received = callback_->Render(audio_data_, requested_frames, 0);
int frames_per_millisecond =
@@ -111,9 +104,9 @@ void NullAudioSink::FillBufferTask() {
}
}
- // Calculate our sleep duration, taking playback rate into consideration.
+ // Calculate our sleep duration.
delay = base::TimeDelta::FromMilliseconds(
- frames_received / (frames_per_millisecond * playback_rate_));
+ frames_received / frames_per_millisecond);
} else {
// If paused, sleep for 10 milliseconds before polling again.
delay = base::TimeDelta::FromMilliseconds(10);
« no previous file with comments | « media/audio/null_audio_sink.h ('k') | media/base/audio_renderer_sink.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698