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

Side by Side Diff: webrtc/media/engine/webrtcmediaengine.cc

Issue 2668523004: Move AudioDecoder and related stuff to the api/ directory (Closed)
Patch Set: more review fixes Created 3 years, 10 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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/media/engine/webrtcmediaengine.h" 11 #include "webrtc/media/engine/webrtcmediaengine.h"
12 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
13 12
14 #include <algorithm> 13 #include <algorithm>
15 14
15 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
16 #include "webrtc/media/engine/webrtcvoiceengine.h"
17
16 #ifdef HAVE_WEBRTC_VIDEO 18 #ifdef HAVE_WEBRTC_VIDEO
17 #include "webrtc/media/engine/webrtcvideoengine2.h" 19 #include "webrtc/media/engine/webrtcvideoengine2.h"
18 #else 20 #else
19 #include "webrtc/media/engine/nullwebrtcvideoengine.h" 21 #include "webrtc/media/engine/nullwebrtcvideoengine.h"
20 #endif 22 #endif
21 #include "webrtc/media/engine/webrtcvoiceengine.h"
22 23
23 namespace cricket { 24 namespace cricket {
24 25
25 class WebRtcMediaEngine2 26 class WebRtcMediaEngine2
26 #ifdef HAVE_WEBRTC_VIDEO 27 #ifdef HAVE_WEBRTC_VIDEO
27 : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> { 28 : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
28 #else 29 #else
29 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> { 30 : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
30 #endif 31 #endif
31 public: 32 public:
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 } 209 }
209 if (codec.GetParam(kCodecParamMaxBitrate, &bitrate_kbps) && 210 if (codec.GetParam(kCodecParamMaxBitrate, &bitrate_kbps) &&
210 bitrate_kbps > 0) { 211 bitrate_kbps > 0) {
211 config.max_bitrate_bps = bitrate_kbps * 1000; 212 config.max_bitrate_bps = bitrate_kbps * 1000;
212 } else { 213 } else {
213 config.max_bitrate_bps = -1; 214 config.max_bitrate_bps = -1;
214 } 215 }
215 return config; 216 return config;
216 } 217 }
217 } // namespace cricket 218 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/payload_type_mapper.cc ('k') | webrtc/media/engine/webrtcmediaengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698