Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: media/audio/android/opensles_output.cc

Issue 868753004: Mechanical rename of tracing includes for /media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part2
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/android/opensles_input.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « media/audio/android/opensles_input.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698