| Index: media/audio/cras/cras_unified.cc
|
| diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc
|
| index 180cfc1e1c6cc8fff68471ab17e422a3ba3ab6dc..1a2fa3ef275972a17666bb71c07f24b2996f203e 100644
|
| --- a/media/audio/cras/cras_unified.cc
|
| +++ b/media/audio/cras/cras_unified.cc
|
| @@ -158,7 +158,7 @@ void CrasUnifiedStream::Start(AudioSourceCallback* callback) {
|
|
|
| // Initialize channel layout to all -1 to indicate that none of
|
| // the channels is set in the layout.
|
| - int8 layout[CRAS_CH_MAX] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
|
| + int8_t layout[CRAS_CH_MAX] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
|
|
|
| // Converts to CRAS defined channels. ChannelOrder will return -1
|
| // for channels that does not present in params_.channel_layout().
|
| @@ -232,9 +232,8 @@ void CrasUnifiedStream::GetVolume(double* volume) {
|
| *volume = volume_;
|
| }
|
|
|
| -uint32 CrasUnifiedStream::GetBytesLatency(
|
| - const struct timespec& latency_ts) {
|
| - uint32 latency_usec;
|
| +uint32_t CrasUnifiedStream::GetBytesLatency(const struct timespec& latency_ts) {
|
| + uint32_t latency_usec;
|
|
|
| // Treat negative latency (if we are too slow to render) as 0.
|
| if (latency_ts.tv_sec < 0 || latency_ts.tv_nsec < 0) {
|
| @@ -253,8 +252,8 @@ uint32 CrasUnifiedStream::GetBytesLatency(
|
| // Static callback asking for samples.
|
| int CrasUnifiedStream::UnifiedCallback(cras_client* client,
|
| cras_stream_id_t stream_id,
|
| - uint8* input_samples,
|
| - uint8* output_samples,
|
| + uint8_t* input_samples,
|
| + uint8_t* output_samples,
|
| unsigned int frames,
|
| const timespec* input_ts,
|
| const timespec* output_ts,
|
| @@ -278,11 +277,11 @@ int CrasUnifiedStream::StreamError(cras_client* client,
|
| }
|
|
|
| // Calls the appropriate rendering function for this type of stream.
|
| -uint32 CrasUnifiedStream::DispatchCallback(size_t frames,
|
| - uint8* input_samples,
|
| - uint8* output_samples,
|
| - const timespec* input_ts,
|
| - const timespec* output_ts) {
|
| +uint32_t CrasUnifiedStream::DispatchCallback(size_t frames,
|
| + uint8_t* input_samples,
|
| + uint8_t* output_samples,
|
| + const timespec* input_ts,
|
| + const timespec* output_ts) {
|
| switch (stream_direction_) {
|
| case CRAS_STREAM_OUTPUT:
|
| return WriteAudio(frames, output_samples, output_ts);
|
| @@ -296,9 +295,9 @@ uint32 CrasUnifiedStream::DispatchCallback(size_t frames,
|
| return 0;
|
| }
|
|
|
| -uint32 CrasUnifiedStream::WriteAudio(size_t frames,
|
| - uint8* buffer,
|
| - const timespec* sample_ts) {
|
| +uint32_t CrasUnifiedStream::WriteAudio(size_t frames,
|
| + uint8_t* buffer,
|
| + const timespec* sample_ts) {
|
| DCHECK_EQ(frames, static_cast<size_t>(output_bus_->frames()));
|
|
|
| // Determine latency and pass that on to the source.
|
|
|