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

Unified Diff: content/renderer/media/audio_renderer_impl.cc

Issue 8909006: Fix start/stop of html5 audio stream and race condition when pausing. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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 | « content/renderer/media/audio_renderer_impl.h ('k') | content/renderer/media/webrtc_audio_device_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_renderer_impl.cc
===================================================================
--- content/renderer/media/audio_renderer_impl.cc (revision 113847)
+++ content/renderer/media/audio_renderer_impl.cc (working copy)
@@ -192,14 +192,14 @@
audio_device_->Pause(true);
}
-void AudioRendererImpl::Render(const std::vector<float*>& audio_data,
- size_t number_of_frames,
- size_t audio_delay_milliseconds) {
+size_t AudioRendererImpl::Render(const std::vector<float*>& audio_data,
+ size_t number_of_frames,
+ size_t audio_delay_milliseconds) {
if (stopped_ || GetPlaybackRate() == 0.0f) {
// Output silence if stopped.
for (size_t i = 0; i < audio_data.size(); ++i)
memset(audio_data[i], 0, sizeof(float) * number_of_frames);
- return;
+ return 0;
}
// Adjust the playback delay.
@@ -227,6 +227,7 @@
request_delay,
time_now >= earliest_end_time_);
DCHECK_LE(filled, buf_size);
+ UpdateEarliestEndTime(filled, request_delay, time_now);
uint32 filled_frames = filled / bytes_per_frame;
@@ -243,7 +244,10 @@
// If FillBuffer() didn't give us enough data then zero out the remainder.
if (filled_frames < number_of_frames) {
int frames_to_zero = number_of_frames - filled_frames;
- memset(audio_data[channel_index], 0, sizeof(float) * frames_to_zero);
+ memset(audio_data[channel_index] + filled_frames,
+ 0,
+ sizeof(float) * frames_to_zero);
}
}
+ return filled_frames;
}
« no previous file with comments | « content/renderer/media/audio_renderer_impl.h ('k') | content/renderer/media/webrtc_audio_device_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698