generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert some variables to uint32_t to fix compile errors on Mac gcc.

Browse Source 
TBR=xians

Review URL: https://webrtc-codereview.appspot.com/1633004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4199 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-06-08 00:43:25 +00:00
parent 6f69eb78dd
commit 569fdef732
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/audio_device/mac/audio_device_mac.h
View File

@ -26,25 +26,25 @@ namespace webrtc
class EventWrapper; class EventWrapper;
class ThreadWrapper; class ThreadWrapper;
const int N_REC_SAMPLES_PER_SEC = 48000; const uint32_t N_REC_SAMPLES_PER_SEC = 48000;
const int N_PLAY_SAMPLES_PER_SEC = 48000; const uint32_t N_PLAY_SAMPLES_PER_SEC = 48000;
const int N_REC_CHANNELS = 1; // default is mono recording const uint32_t N_REC_CHANNELS = 1; // default is mono recording
const int N_PLAY_CHANNELS = 2; // default is stereo playout const uint32_t N_PLAY_CHANNELS = 2; // default is stereo playout
const int N_DEVICE_CHANNELS = 64; const uint32_t N_DEVICE_CHANNELS = 64;
const int ENGINE_REC_BUF_SIZE_IN_SAMPLES = (N_REC_SAMPLES_PER_SEC / 100); const uint32_t ENGINE_REC_BUF_SIZE_IN_SAMPLES = (N_REC_SAMPLES_PER_SEC / 100);
const int ENGINE_PLAY_BUF_SIZE_IN_SAMPLES = (N_PLAY_SAMPLES_PER_SEC / 100); const uint32_t ENGINE_PLAY_BUF_SIZE_IN_SAMPLES = (N_PLAY_SAMPLES_PER_SEC / 100);
const int N_BLOCKS_IO = 2; const int N_BLOCKS_IO = 2;
const int N_BUFFERS_IN = 2; // Must be at least N_BLOCKS_IO. const int N_BUFFERS_IN = 2; // Must be at least N_BLOCKS_IO.
const int N_BUFFERS_OUT = 3; // Must be at least N_BLOCKS_IO. const int N_BUFFERS_OUT = 3; // Must be at least N_BLOCKS_IO.
const int TIMER_PERIOD_MS = (2 * 10 * N_BLOCKS_IO * 1000000); const uint32_t TIMER_PERIOD_MS = (2 * 10 * N_BLOCKS_IO * 1000000);
const int REC_BUF_SIZE_IN_SAMPLES = const uint32_t REC_BUF_SIZE_IN_SAMPLES =
ENGINE_REC_BUF_SIZE_IN_SAMPLES * N_DEVICE_CHANNELS * N_BUFFERS_IN; ENGINE_REC_BUF_SIZE_IN_SAMPLES * N_DEVICE_CHANNELS * N_BUFFERS_IN;
const int PLAY_BUF_SIZE_IN_SAMPLES = const uint32_t PLAY_BUF_SIZE_IN_SAMPLES =
ENGINE_PLAY_BUF_SIZE_IN_SAMPLES * N_PLAY_CHANNELS * N_BUFFERS_OUT; ENGINE_PLAY_BUF_SIZE_IN_SAMPLES * N_PLAY_CHANNELS * N_BUFFERS_OUT;
class AudioDeviceMac: public AudioDeviceGeneric class AudioDeviceMac: public AudioDeviceGeneric