OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/android/opensles_output.h" | 5 #include "media/audio/android/opensles_output.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | |
8 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/trace_event/trace_event.h" |
9 #include "media/audio/android/audio_manager_android.h" | 9 #include "media/audio/android/audio_manager_android.h" |
10 | 10 |
11 #define LOG_ON_FAILURE_AND_RETURN(op, ...) \ | 11 #define LOG_ON_FAILURE_AND_RETURN(op, ...) \ |
12 do { \ | 12 do { \ |
13 SLresult err = (op); \ | 13 SLresult err = (op); \ |
14 if (err != SL_RESULT_SUCCESS) { \ | 14 if (err != SL_RESULT_SUCCESS) { \ |
15 DLOG(ERROR) << #op << " failed: " << err; \ | 15 DLOG(ERROR) << #op << " failed: " << err; \ |
16 return __VA_ARGS__; \ | 16 return __VA_ARGS__; \ |
17 } \ | 17 } \ |
18 } while (0) | 18 } while (0) |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 } | 373 } |
374 } | 374 } |
375 | 375 |
376 void OpenSLESOutputStream::HandleError(SLresult error) { | 376 void OpenSLESOutputStream::HandleError(SLresult error) { |
377 DLOG(ERROR) << "OpenSLES Output error " << error; | 377 DLOG(ERROR) << "OpenSLES Output error " << error; |
378 if (callback_) | 378 if (callback_) |
379 callback_->OnError(this); | 379 callback_->OnError(this); |
380 } | 380 } |
381 | 381 |
382 } // namespace media | 382 } // namespace media |
OLD | NEW |