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

Unified Diff: content/renderer/pepper/pepper_audio_input_host.cc

Issue 22886005: Switch audio synchronization from sleep() based to select() based. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DCHECK. Created 7 years, 2 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 | « content/browser/renderer_host/media/audio_sync_reader.cc ('k') | media/audio/audio_device_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_audio_input_host.cc
diff --git a/content/renderer/pepper/pepper_audio_input_host.cc b/content/renderer/pepper/pepper_audio_input_host.cc
index 331bb49065fa6b5894aef8bd09726e5d095d3b3b..59b4f98e0cd5be364a3d48013336dd255d243fec 100644
--- a/content/renderer/pepper/pepper_audio_input_host.cc
+++ b/content/renderer/pepper/pepper_audio_input_host.cc
@@ -12,7 +12,6 @@
#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
#include "content/renderer/render_view_impl.h"
#include "ipc/ipc_message.h"
-#include "media/audio/shared_memory_util.h"
#include "ppapi/c/pp_errors.h"
#include "ppapi/host/dispatch_host_message.h"
#include "ppapi/host/ppapi_host.h"
@@ -169,13 +168,7 @@ void PepperAudioInputHost::OnOpenComplete(
scoped_socket, scoped_shared_memory, &temp_socket, &temp_shmem);
serialized_socket_handle.set_socket(temp_socket);
- // Note that we must call TotalSharedMemorySizeInBytes() because extra space
- // in shared memory is allocated for book-keeping, so the actual size of the
- // shared memory buffer is larger than |shared_memory_size|. When sending to
- // NaCl, NaClIPCAdapter expects this size to match the size of the full
- // shared memory buffer.
- serialized_shared_memory_handle.set_shmem(
- temp_shmem, media::TotalSharedMemorySizeInBytes(shared_memory_size));
+ serialized_shared_memory_handle.set_shmem(temp_shmem, shared_memory_size);
}
// Send all the values, even on error. This simplifies some of our cleanup
« no previous file with comments | « content/browser/renderer_host/media/audio_sync_reader.cc ('k') | media/audio/audio_device_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698