Index: media/audio/audio_input_device.cc |
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc |
index 02fa7a7ad681c68b08085a77807905f414e21b2b..9552350a9d477afedd057416b6048b1221b721c2 100644 |
--- a/media/audio/audio_input_device.cc |
+++ b/media/audio/audio_input_device.cc |
@@ -36,7 +36,7 @@ class AudioInputDevice::AudioThreadCallback |
void MapSharedMemory() override; |
// Called whenever we receive notifications about pending data. |
- void Process(uint32 pending_data) override; |
+ void Process(uint32_t pending_data) override; |
private: |
int current_segment_id_; |
@@ -141,8 +141,8 @@ void AudioInputDevice::OnStreamCreated( |
DCHECK(audio_thread_.IsStopped()); |
audio_callback_.reset(new AudioInputDevice::AudioThreadCallback( |
audio_parameters_, handle, length, total_segments, callback_)); |
- audio_thread_.Start( |
- audio_callback_.get(), socket_handle, "AudioInputDevice", true); |
+ audio_thread_.Start(audio_callback_.get(), socket_handle, "AudioInputDevice", |
+ true); |
tommi (sloooow) - chröme
2015/12/08 08:34:51
no change?
Henrik Grunell
2015/12/08 09:30:34
Mandatory "git cl format media"...
tommi (sloooow) - chröme
2015/12/08 10:08:09
git cl format isn't supposed to change code that h
Henrik Grunell
2015/12/08 11:12:32
Ah, yes that's what happened. Reverted.
|
state_ = RECORDING; |
ipc_->RecordStream(); |
@@ -297,7 +297,7 @@ void AudioInputDevice::AudioThreadCallback::MapSharedMemory() { |
} |
} |
-void AudioInputDevice::AudioThreadCallback::Process(uint32 pending_data) { |
+void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) { |
// The shared memory represents parameters, size of the data buffer and the |
// actual data buffer containing audio data. Map the memory into this |
// structure and parse out parameters and the data area. |