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

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

Issue 1737593002: Move webrtc/audio/audio_sink.h to webrtc/ and fix some dependencies. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added a few more missing headers 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
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/pc/channel.h » ('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) 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/engine/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_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"
(...skipping 2485 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 } 2520 }
2521 } else { 2521 } else {
2522 LOG(LS_INFO) << "Stopping playout for channel #" << channel; 2522 LOG(LS_INFO) << "Stopping playout for channel #" << channel;
2523 engine()->voe()->base()->StopPlayout(channel); 2523 engine()->voe()->base()->StopPlayout(channel);
2524 } 2524 }
2525 return true; 2525 return true;
2526 } 2526 }
2527 } // namespace cricket 2527 } // namespace cricket
2528 2528
2529 #endif // HAVE_WEBRTC_VOICE 2529 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/pc/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698