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

Unified Diff: content/browser/renderer_host/media/audio_sync_reader.cc

Issue 1538563002: Forward the number of skipped frames by the OS in audio playout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review fix. git cl format. Rebase. Created 5 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
Index: content/browser/renderer_host/media/audio_sync_reader.cc
diff --git a/content/browser/renderer_host/media/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc
index f6b3d6cef3f7db4a593402a2b355381fc8180f6a..ea794a213c070a3666843f35272f0a87a930b528 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.cc
+++ b/content/browser/renderer_host/media/audio_sync_reader.cc
@@ -15,6 +15,7 @@
#include "media/audio/audio_parameters.h"
using media::AudioBus;
+using media::AudioOutputBuffer;
namespace {
@@ -51,8 +52,12 @@ AudioSyncReader::AudioSyncReader(base::SharedMemory* shared_memory,
maximum_wait_time_(base::TimeDelta::FromMilliseconds(20)),
#endif
buffer_index_(0) {
- DCHECK_EQ(packet_size_, AudioBus::CalculateMemorySize(params));
- output_bus_ = AudioBus::WrapMemory(params, shared_memory->memory());
+ DCHECK_EQ(static_cast<size_t>(packet_size_),
+ sizeof(media::AudioOutputBufferParameters) +
+ AudioBus::CalculateMemorySize(params));
+ AudioOutputBuffer* buffer =
+ reinterpret_cast<AudioOutputBuffer*>(shared_memory_->memory());
+ output_bus_ = AudioBus::WrapMemory(params, buffer->audio);
output_bus_->Zero();
}
@@ -81,10 +86,19 @@ AudioSyncReader::~AudioSyncReader() {
}
// media::AudioOutputController::SyncReader implementations.
-void AudioSyncReader::UpdatePendingBytes(uint32 bytes) {
+void AudioSyncReader::UpdatePendingBytes(uint32_t bytes,
+ uint32_t frames_skipped) {
+ // Increase the number of skipped frames stored in shared memory. We don't
+ // send it over the socket since sending more than 4 bytes might lead to being
+ // descheduled. The reading side will zero it when consumed.
+ AudioOutputBuffer* buffer =
+ reinterpret_cast<AudioOutputBuffer*>(shared_memory_->memory());
+ buffer->params.frames_skipped += frames_skipped;
+
// Zero out the entire output buffer to avoid stuttering/repeating-buffers
// in the anomalous case if the renderer is unable to keep up with real-time.
output_bus_->Zero();
+
socket_->Send(&bytes, sizeof(bytes));
++buffer_index_;
}
« no previous file with comments | « content/browser/renderer_host/media/audio_sync_reader.h ('k') | content/renderer/media/audio_track_recorder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698