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

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

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 Created 4 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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 #ifdef HAVE_CONFIG_H 11 #ifdef HAVE_CONFIG_H
12 #include <config.h> 12 #include <config.h>
13 #endif 13 #endif
14 14
15 #ifdef HAVE_WEBRTC_VOICE 15 #ifdef HAVE_WEBRTC_VOICE
16 16
17 #include "webrtc/media/webrtc/webrtcvoiceengine.h" 17 #include "webrtc/media/engine/webrtcvoiceengine.h"
18 18
19 #include <algorithm> 19 #include <algorithm>
20 #include <cstdio> 20 #include <cstdio>
21 #include <string> 21 #include <string>
22 #include <vector> 22 #include <vector>
23 23
24 #include "webrtc/audio/audio_sink.h" 24 #include "webrtc/audio/audio_sink.h"
25 #include "webrtc/base/arraysize.h" 25 #include "webrtc/base/arraysize.h"
26 #include "webrtc/base/base64.h" 26 #include "webrtc/base/base64.h"
27 #include "webrtc/base/byteorder.h" 27 #include "webrtc/base/byteorder.h"
28 #include "webrtc/base/common.h" 28 #include "webrtc/base/common.h"
29 #include "webrtc/base/helpers.h" 29 #include "webrtc/base/helpers.h"
30 #include "webrtc/base/logging.h" 30 #include "webrtc/base/logging.h"
31 #include "webrtc/base/stringencode.h" 31 #include "webrtc/base/stringencode.h"
32 #include "webrtc/base/stringutils.h" 32 #include "webrtc/base/stringutils.h"
33 #include "webrtc/call/rtc_event_log.h" 33 #include "webrtc/call/rtc_event_log.h"
34 #include "webrtc/common.h" 34 #include "webrtc/common.h"
35 #include "webrtc/media/base/audioframe.h" 35 #include "webrtc/media/base/audioframe.h"
36 #include "webrtc/media/base/audiorenderer.h" 36 #include "webrtc/media/base/audiorenderer.h"
37 #include "webrtc/media/base/constants.h" 37 #include "webrtc/media/base/constants.h"
38 #include "webrtc/media/base/streamparams.h" 38 #include "webrtc/media/base/streamparams.h"
39 #include "webrtc/media/webrtc/webrtcmediaengine.h" 39 #include "webrtc/media/engine/webrtcmediaengine.h"
40 #include "webrtc/media/webrtc/webrtcvoe.h" 40 #include "webrtc/media/engine/webrtcvoe.h"
41 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 41 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
42 #include "webrtc/modules/audio_processing/include/audio_processing.h" 42 #include "webrtc/modules/audio_processing/include/audio_processing.h"
43 #include "webrtc/system_wrappers/include/field_trial.h" 43 #include "webrtc/system_wrappers/include/field_trial.h"
44 #include "webrtc/system_wrappers/include/trace.h" 44 #include "webrtc/system_wrappers/include/trace.h"
45 45
46 namespace cricket { 46 namespace cricket {
47 namespace { 47 namespace {
48 48
49 const int kDefaultTraceFilter = webrtc::kTraceNone | webrtc::kTraceTerseInfo | 49 const int kDefaultTraceFilter = webrtc::kTraceNone | webrtc::kTraceTerseInfo |
50 webrtc::kTraceWarning | webrtc::kTraceError | 50 webrtc::kTraceWarning | webrtc::kTraceError |
(...skipping 2502 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 } 2553 }
2554 } else { 2554 } else {
2555 LOG(LS_INFO) << "Stopping playout for channel #" << channel; 2555 LOG(LS_INFO) << "Stopping playout for channel #" << channel;
2556 engine()->voe()->base()->StopPlayout(channel); 2556 engine()->voe()->base()->StopPlayout(channel);
2557 } 2557 }
2558 return true; 2558 return true;
2559 } 2559 }
2560 } // namespace cricket 2560 } // namespace cricket
2561 2561
2562 #endif // HAVE_WEBRTC_VOICE 2562 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.h ('k') | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698