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

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

Issue 9316084: Switch back to 'int' instead of uint32 and call CancelIo before closing the socket handle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 | « base/sync_socket_win.cc ('k') | content/renderer/media/audio_input_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_device.cc
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index 19349c9116169543d521b6fd4fd336726bdcb294..b9ded10556a051e61a6818fc91aad1cd2fbcadef 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -278,7 +278,7 @@ void AudioDevice::Run() {
const int bytes_per_ms = channels_ * (bits_per_sample_ / 8) * samples_per_ms;
while (true) {
- uint32 pending_data = 0;
+ int pending_data = 0;
size_t bytes_read = audio_socket->Receive(&pending_data,
sizeof(pending_data));
if (bytes_read != sizeof(pending_data)) {
@@ -286,8 +286,7 @@ void AudioDevice::Run() {
break;
}
- if (pending_data ==
- static_cast<uint32>(media::AudioOutputController::kPauseMark)) {
+ if (pending_data == media::AudioOutputController::kPauseMark) {
memset(shared_memory.memory(), 0, memory_length_);
media::SetActualDataSizeInBytes(&shared_memory, memory_length_, 0);
continue;
« no previous file with comments | « base/sync_socket_win.cc ('k') | content/renderer/media/audio_input_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698