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

Unified Diff: webrtc/api/audio/audio_mixer.h

Issue 2411313003: Split audio mixer into interface and implementation. (Closed)
Patch Set: Comments, spelling and capitalization of virtual methods. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/modules/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 85%
rename from webrtc/modules/audio_mixer/audio_mixer.h
rename to webrtc/api/audio/audio_mixer.h
index 7e58a8d6a01635a9dde3fa60453131be2e088137..eea79ae6535e316397b76da13c0bfb778a0767fa 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>
@@ -25,10 +25,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 +48,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 +76,4 @@ class AudioMixer : public rtc::RefCountInterface {
};
} // namespace webrtc
-#endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
+#endif // WEBRTC_API_AUDIO_AUDIO_MIXER_H_
« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/modules/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698