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

Side by Side Diff: webrtc/modules/utility/source/file_player.cc

Issue 2401673002: Delete old video defines in engine config and rename file (Closed)
Patch Set: And GYP Created 4 years, 2 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
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/modules/utility/include/file_player.h" 11 #include "webrtc/modules/utility/include/file_player.h"
12 12
13 #include "webrtc/common_audio/resampler/include/resampler.h" 13 #include "webrtc/common_audio/resampler/include/resampler.h"
14 #include "webrtc/common_types.h" 14 #include "webrtc/common_types.h"
15 #include "webrtc/engine_configurations.h"
16 #include "webrtc/modules/media_file/media_file.h" 15 #include "webrtc/modules/media_file/media_file.h"
17 #include "webrtc/modules/media_file/media_file_defines.h" 16 #include "webrtc/modules/media_file/media_file_defines.h"
18 #include "webrtc/modules/utility/source/coder.h" 17 #include "webrtc/modules/utility/source/coder.h"
19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 18 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 #include "webrtc/system_wrappers/include/logging.h" 19 #include "webrtc/system_wrappers/include/logging.h"
21 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
21 #include "webrtc/voice_engine_configurations.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 namespace { 25 namespace {
26 26
27 class FilePlayerImpl : public FilePlayer { 27 class FilePlayerImpl : public FilePlayer {
28 public: 28 public:
29 FilePlayerImpl(uint32_t instanceID, FileFormats fileFormat); 29 FilePlayerImpl(uint32_t instanceID, FileFormats fileFormat);
30 ~FilePlayerImpl() override; 30 ~FilePlayerImpl() override;
31 31
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 // audio formats 384 // audio formats
385 return std::unique_ptr<FilePlayer>( 385 return std::unique_ptr<FilePlayer>(
386 new FilePlayerImpl(instanceID, fileFormat)); 386 new FilePlayerImpl(instanceID, fileFormat));
387 default: 387 default:
388 assert(false); 388 assert(false);
389 return nullptr; 389 return nullptr;
390 } 390 }
391 } 391 }
392 392
393 } // namespace webrtc 393 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/utility/include/file_recorder.h ('k') | webrtc/modules/utility/source/file_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698