Index: webrtc/api/audio/audio_mixer.h |
diff --git a/webrtc/modules/audio_mixer/audio_mixer.h b/webrtc/api/audio/audio_mixer.h |
similarity index 81% |
rename from webrtc/modules/audio_mixer/audio_mixer.h |
rename to webrtc/api/audio/audio_mixer.h |
index 7e58a8d6a01635a9dde3fa60453131be2e088137..960adbbd430b8cb24403a5736aa9f0d039a43a6d 100644 |
--- a/webrtc/modules/audio_mixer/audio_mixer.h |
+++ b/webrtc/api/audio/audio_mixer.h |
@@ -8,8 +8,8 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ |
-#define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ |
+#ifndef WEBRTC_API_AUDIO_AUDIO_MIXER_H_ |
+#define WEBRTC_API_AUDIO_AUDIO_MIXER_H_ |
#include <memory> |
the sun
2016/10/20 09:13:05
not needed?
aleloi
2016/10/20 09:35:18
There is a unique_ptr<AudioProcessing> argument to
|
@@ -18,6 +18,9 @@ |
namespace webrtc { |
+// WORK IN PROGRESS |
kwiberg-webrtc
2016/10/20 09:24:12
Are we allowed to use Unicode in source files yet?
aleloi
2016/10/20 09:35:18
Hm... I wonder what that will do to peoples editor
|
+// This class is under development and is not yet intended for for use outside |
+// of WebRtc/Libjingle. |
class AudioMixer : public rtc::RefCountInterface { |
public: |
// A callback class that all mixer participants must inherit from/implement. |
@@ -25,10 +28,11 @@ class AudioMixer : public rtc::RefCountInterface { |
public: |
enum class AudioFrameInfo { |
kNormal, // The samples in audio_frame are valid and should be used. |
- kMuted, // The samples in audio_frame should not be used, but should be |
- // implicitly interpreted as zero. Other fields in audio_frame |
- // may be read and should contain meaningful values. |
- kError // audio_frame will not be used. |
+ kMuted, // The samples in audio_frame should not be used, but |
+ // should be implicitly interpreted as zero. Other |
+ // fields in audio_frame may be read and should |
+ // contain meaningful values. |
+ kError, // The audio_frame will not be used. |
}; |
struct AudioFrameWithInfo { |
@@ -47,8 +51,8 @@ class AudioMixer : public rtc::RefCountInterface { |
// mixer. |
virtual AudioFrameWithInfo GetAudioFrameWithInfo(int sample_rate_hz) = 0; |
- // A way for a mixer implementation do distinguish participants. |
- virtual int ssrc() = 0; |
+ // A way for a mixer implementation to distinguish participants. |
+ virtual int Ssrc() = 0; |
protected: |
virtual ~Source() {} |
@@ -75,4 +79,4 @@ class AudioMixer : public rtc::RefCountInterface { |
}; |
} // namespace webrtc |
-#endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ |
+#endif // WEBRTC_API_AUDIO_AUDIO_MIXER_H_ |