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

Unified Diff: media/audio/win/waveout_output_win.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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: media/audio/win/waveout_output_win.cc
diff --git a/media/audio/win/waveout_output_win.cc b/media/audio/win/waveout_output_win.cc
index 456124dbf2637f4e07d4e29f934dcc2a7618b1fb..7c76ba8e1ae64db2d64969b1580471b20c9401bf 100644
--- a/media/audio/win/waveout_output_win.cc
+++ b/media/audio/win/waveout_output_win.cc
@@ -7,7 +7,6 @@
#pragma comment(lib, "winmm.lib")
#include "base/atomicops.h"
-#include "base/basictypes.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
#include "media/audio/audio_io.h"
@@ -25,7 +24,7 @@ namespace media {
// synchronized to the actual device state.
// Sixty four MB is the maximum buffer size per AudioOutputStream.
-static const uint32 kMaxOpenBufferSize = 1024 * 1024 * 64;
+static const uint32_t kMaxOpenBufferSize = 1024 * 1024 * 64;
// See Also
// http://www.thx.com/consumer/home-entertainment/home-theater/surround-sound-speaker-set-up/
@@ -326,11 +325,11 @@ void PCMWaveOutAudioOutputStream::QueueNextPacket(WAVEHDR *buffer) {
// TODO(fbarchard): Handle used 0 by queueing more.
// TODO(sergeyu): Specify correct hardware delay for |total_delay_bytes|.
- uint32 total_delay_bytes = pending_bytes_;
+ uint32_t total_delay_bytes = pending_bytes_;
int frames_filled =
callback_->OnMoreData(audio_bus_.get(), total_delay_bytes, 0);
- uint32 used = frames_filled * audio_bus_->channels() *
- format_.Format.wBitsPerSample / 8;
+ uint32_t used = frames_filled * audio_bus_->channels() *
+ format_.Format.wBitsPerSample / 8;
if (used <= buffer_size_) {
// Note: If this ever changes to output raw float the data must be clipped

Powered by Google App Engine
This is Rietveld 408576698