Index: media/audio/audio_device_thread.cc |
=================================================================== |
--- media/audio/audio_device_thread.cc (revision 186364) |
+++ media/audio/audio_device_thread.cc (working copy) |
@@ -163,7 +163,7 @@ |
int pending_data = 0; |
size_t bytes_read = socket_.Receive(&pending_data, sizeof(pending_data)); |
if (bytes_read != sizeof(pending_data)) { |
- DCHECK_EQ(bytes_read, 0U); |
+ DCHECK_EQ(0U, bytes_read); |
DaleCurtis
2013/03/07 02:04:37
/shakes fist! :) nooooo!
|
break; |
} |
@@ -177,16 +177,22 @@ |
AudioDeviceThread::Callback::Callback( |
const AudioParameters& audio_parameters, |
- base::SharedMemoryHandle memory, int memory_length) |
+ base::SharedMemoryHandle memory, |
+ int memory_length, |
+ int total_segments) |
: audio_parameters_(audio_parameters), |
samples_per_ms_(audio_parameters.sample_rate() / 1000), |
bytes_per_ms_(audio_parameters.channels() * |
(audio_parameters_.bits_per_sample() / 8) * |
samples_per_ms_), |
shared_memory_(memory, false), |
- memory_length_(memory_length) { |
- CHECK_NE(bytes_per_ms_, 0); // Catch division by zero early. |
- CHECK_NE(samples_per_ms_, 0); |
+ memory_length_(memory_length), |
+ total_segments_(total_segments) { |
+ CHECK_NE(0, bytes_per_ms_); // Catch division by zero early. |
DaleCurtis
2013/03/07 02:04:37
:head explodes:
|
+ CHECK_NE(0, samples_per_ms_); |
+ CHECK_LT(0, total_segments_); |
+ CHECK_EQ(0, memory_length_ % total_segments_); |
+ segment_length_ = memory_length_ / total_segments_; |
} |
AudioDeviceThread::Callback::~Callback() {} |