| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/audio/cras/cras_unified.h" | 5 #include "media/audio/cras/cras_unified.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" |
| 8 #include "media/audio/cras/audio_manager_cras.h" | 9 #include "media/audio/cras/audio_manager_cras.h" |
| 9 | 10 |
| 10 namespace media { | 11 namespace media { |
| 11 | 12 |
| 12 // Overview of operation: | 13 // Overview of operation: |
| 13 // 1) An object of CrasUnifiedStream is created by the AudioManager | 14 // 1) An object of CrasUnifiedStream is created by the AudioManager |
| 14 // factory: audio_man->MakeAudioStream(). | 15 // factory: audio_man->MakeAudioStream(). |
| 15 // 2) Next some thread will call Open(), at that point a client is created and | 16 // 2) Next some thread will call Open(), at that point a client is created and |
| 16 // configured for the correct format and sample rate. | 17 // configured for the correct format and sample rate. |
| 17 // 3) Then Start(source) is called and a stream is added to the CRAS client | 18 // 3) Then Start(source) is called and a stream is added to the CRAS client |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 return frames_filled; | 316 return frames_filled; |
| 316 } | 317 } |
| 317 | 318 |
| 318 void CrasUnifiedStream::NotifyStreamError(int err) { | 319 void CrasUnifiedStream::NotifyStreamError(int err) { |
| 319 // This will remove the stream from the client. | 320 // This will remove the stream from the client. |
| 320 if (source_callback_) | 321 if (source_callback_) |
| 321 source_callback_->OnError(this); | 322 source_callback_->OnError(this); |
| 322 } | 323 } |
| 323 | 324 |
| 324 } // namespace media | 325 } // namespace media |
| OLD | NEW |