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

Side by Side Diff: webrtc/voice_engine/file_player.cc

Issue 2781343002: Replace use of system_wrappers/include/logging.h by base/logging.h. (Closed)
Patch Set: Rebased. Created 3 years, 8 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 | « webrtc/voice_engine/BUILD.gn ('k') | webrtc/voice_engine/file_recorder.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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/voice_engine/file_player.h" 11 #include "webrtc/voice_engine/file_player.h"
12 12
13 #include "webrtc/base/logging.h"
13 #include "webrtc/common_audio/resampler/include/resampler.h" 14 #include "webrtc/common_audio/resampler/include/resampler.h"
14 #include "webrtc/common_types.h" 15 #include "webrtc/common_types.h"
15 #include "webrtc/modules/media_file/media_file.h" 16 #include "webrtc/modules/media_file/media_file.h"
16 #include "webrtc/modules/media_file/media_file_defines.h" 17 #include "webrtc/modules/media_file/media_file_defines.h"
17 #include "webrtc/system_wrappers/include/logging.h"
18 #include "webrtc/typedefs.h" 18 #include "webrtc/typedefs.h"
19 #include "webrtc/voice_engine/coder.h" 19 #include "webrtc/voice_engine/coder.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 namespace { 23 namespace {
24 24
25 class FilePlayerImpl : public FilePlayer { 25 class FilePlayerImpl : public FilePlayer {
26 public: 26 public:
27 FilePlayerImpl(uint32_t instanceID, FileFormats fileFormat); 27 FilePlayerImpl(uint32_t instanceID, FileFormats fileFormat);
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // audio formats 382 // audio formats
383 return std::unique_ptr<FilePlayer>( 383 return std::unique_ptr<FilePlayer>(
384 new FilePlayerImpl(instanceID, fileFormat)); 384 new FilePlayerImpl(instanceID, fileFormat));
385 default: 385 default:
386 assert(false); 386 assert(false);
387 return nullptr; 387 return nullptr;
388 } 388 }
389 } 389 }
390 390
391 } // namespace webrtc 391 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/BUILD.gn ('k') | webrtc/voice_engine/file_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698