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

Side by Side Diff: webrtc/api/audio/audio_mixer.h

Issue 2411313003: Split audio mixer into interface and implementation. (Closed)
Patch Set: visibility 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 11 #ifndef WEBRTC_API_AUDIO_AUDIO_MIXER_H_
12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 12 #define WEBRTC_API_AUDIO_AUDIO_MIXER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/refcount.h" 16 #include "webrtc/base/refcount.h"
17 #include "webrtc/modules/include/module_common_types.h" 17 #include "webrtc/modules/include/module_common_types.h"
the sun 2016/10/12 15:26:10 This should be a forbidden inclusion?
aleloi 2016/10/12 15:36:02 No, since GN currently doesn't know about module_c
the sun 2016/10/13 07:55:00 kjellander@, is there a way to set GN up so only c
aleloi 2016/10/13 08:40:02 I can attempt to answer that: you can declare some
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 class AudioMixer : public rtc::RefCountInterface { 21 class AudioMixer : public rtc::RefCountInterface {
22 public: 22 public:
23 // A callback class that all mixer participants must inherit from/implement. 23 // A callback class that all mixer participants must inherit from/implement.
24 class Source { 24 class Source {
25 public: 25 public:
26 enum class AudioFrameInfo { 26 enum class AudioFrameInfo {
27 kNormal, // The samples in audio_frame are valid and should be used. 27 kNormal, // The samples in audio_frame are valid and should be used.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // Performs mixing by asking registered audio sources for audio. The 68 // Performs mixing by asking registered audio sources for audio. The
69 // mixed result is placed in the provided AudioFrame. Will only be 69 // mixed result is placed in the provided AudioFrame. Will only be
70 // called from a single thread. The rate and channels arguments 70 // called from a single thread. The rate and channels arguments
71 // specify the rate and number of channels of the mix result. 71 // specify the rate and number of channels of the mix result.
72 virtual void Mix(int sample_rate_hz, 72 virtual void Mix(int sample_rate_hz,
73 size_t number_of_channels, 73 size_t number_of_channels,
74 AudioFrame* audio_frame_for_mixing) = 0; 74 AudioFrame* audio_frame_for_mixing) = 0;
75 }; 75 };
76 } // namespace webrtc 76 } // namespace webrtc
77 77
78 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 78 #endif // WEBRTC_API_AUDIO_AUDIO_MIXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698