summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 00:16:58 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 00:16:58 +0000
commit88a7a3b61dcbf38ba0513a43e6f9717de2c9c824 (patch)
treecc2c5d99aaa9bbd089b8fdbb5767a67c47dc0c28
parentaf5be60cbcae802fb4fed73a7f4fe7527b7e1a26 (diff)
downloadchromium_src-88a7a3b61dcbf38ba0513a43e6f9717de2c9c824.zip
chromium_src-88a7a3b61dcbf38ba0513a43e6f9717de2c9c824.tar.gz
chromium_src-88a7a3b61dcbf38ba0513a43e6f9717de2c9c824.tar.bz2
Fix win64 build breakage in media/audio/win
Looks like r180936 broke the Win64 build. R=scherkus@chromium.org, henrika@chromium.org, wolenetz@chromium.org TBR=scherkus Review URL: https://codereview.chromium.org/12212036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181108 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/audio/win/audio_low_latency_output_win.cc4
-rw-r--r--media/audio/win/audio_low_latency_output_win.h2
-rw-r--r--media/audio/win/audio_unified_win.h4
-rw-r--r--media/audio/win/core_audio_util_win.cc4
-rw-r--r--media/audio/win/core_audio_util_win.h2
5 files changed, 8 insertions, 8 deletions
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index ba88c43..01be01a 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -606,7 +606,7 @@ void WASAPIAudioOutputStream::HandleError(HRESULT err) {
}
HRESULT WASAPIAudioOutputStream::ExclusiveModeInitialization(
- IAudioClient* client, HANDLE event_handle, size_t* endpoint_buffer_size) {
+ IAudioClient* client, HANDLE event_handle, uint32* endpoint_buffer_size) {
DCHECK_EQ(share_mode_, AUDCLNT_SHAREMODE_EXCLUSIVE);
float f = (1000.0 * packet_size_frames_) / format_.Format.nSamplesPerSec;
@@ -679,7 +679,7 @@ HRESULT WASAPIAudioOutputStream::ExclusiveModeInitialization(
return hr;
}
- *endpoint_buffer_size = static_cast<size_t>(buffer_size_in_frames);
+ *endpoint_buffer_size = buffer_size_in_frames;
DVLOG(2) << "endpoint buffer size: " << buffer_size_in_frames;
return hr;
}
diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h
index a50b6c3..cf7aeec 100644
--- a/media/audio/win/audio_low_latency_output_win.h
+++ b/media/audio/win/audio_low_latency_output_win.h
@@ -171,7 +171,7 @@ class MEDIA_EXPORT WASAPIAudioOutputStream :
// for exclusive audio mode.
HRESULT ExclusiveModeInitialization(IAudioClient* client,
HANDLE event_handle,
- size_t* endpoint_buffer_size);
+ uint32* endpoint_buffer_size);
// Contains the thread ID of the creating thread.
base::PlatformThreadId creating_thread_id_;
diff --git a/media/audio/win/audio_unified_win.h b/media/audio/win/audio_unified_win.h
index 3f7cd68..2f69e10 100644
--- a/media/audio/win/audio_unified_win.h
+++ b/media/audio/win/audio_unified_win.h
@@ -129,8 +129,8 @@ class MEDIA_EXPORT WASAPIUnifiedStream
size_t packet_size_frames_;
// Length of the audio endpoint buffer.
- size_t endpoint_render_buffer_size_frames_;
- size_t endpoint_capture_buffer_size_frames_;
+ uint32 endpoint_render_buffer_size_frames_;
+ uint32 endpoint_capture_buffer_size_frames_;
// Counts the number of audio frames written to the endpoint buffer.
uint64 num_written_frames_;
diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc
index 027fbca..9dda0bf 100644
--- a/media/audio/win/core_audio_util_win.cc
+++ b/media/audio/win/core_audio_util_win.cc
@@ -466,7 +466,7 @@ HRESULT CoreAudioUtil::GetPreferredAudioParameters(
HRESULT CoreAudioUtil::SharedModeInitialize(IAudioClient* client,
const WAVEFORMATPCMEX* format,
HANDLE event_handle,
- size_t* endpoint_buffer_size) {
+ uint32* endpoint_buffer_size) {
DCHECK(IsSupported());
DWORD stream_flags = AUDCLNT_STREAMFLAGS_NOPERSIST;
@@ -508,7 +508,7 @@ HRESULT CoreAudioUtil::SharedModeInitialize(IAudioClient* client,
return hr;
}
- *endpoint_buffer_size = static_cast<size_t>(buffer_size_in_frames);
+ *endpoint_buffer_size = buffer_size_in_frames;
DVLOG(2) << "endpoint buffer size: " << buffer_size_in_frames;
// TODO(henrika): utilize when delay measurements are added.
diff --git a/media/audio/win/core_audio_util_win.h b/media/audio/win/core_audio_util_win.h
index 6dbdbfb..5059856 100644
--- a/media/audio/win/core_audio_util_win.h
+++ b/media/audio/win/core_audio_util_win.h
@@ -148,7 +148,7 @@ class MEDIA_EXPORT CoreAudioUtil {
static HRESULT SharedModeInitialize(IAudioClient* client,
const WAVEFORMATPCMEX* format,
HANDLE event_handle,
- size_t* endpoint_buffer_size);
+ uint32* endpoint_buffer_size);
// TODO(henrika): add ExclusiveModeInitialize(...)
// Create an IAudioRenderClient client for an existing IAudioClient given by