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

Unified Diff: webrtc/voice_engine/channel_proxy.h

Issue 2378143004: Made AudioReceiveStream a mixer participant. (Closed)
Patch Set: Created 4 years, 3 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
Index: webrtc/voice_engine/channel_proxy.h
diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h
index d84e73b60f605d513e7dd5fc9cc91d48174523cb..05999ec8a13d7a8d783c014278868d9f9db514fd 100644
--- a/webrtc/voice_engine/channel_proxy.h
+++ b/webrtc/voice_engine/channel_proxy.h
@@ -15,6 +15,7 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/voice_engine/channel_manager.h"
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
#include <memory>
#include <string>
@@ -91,6 +92,10 @@ class ChannelProxy {
virtual void SetRtcEventLog(RtcEventLog* event_log);
+ virtual MixerAudioSource::AudioFrameWithMuted GetAudioFrameWithMuted(
+ int32_t id,
+ int sample_rate_hz);
+
private:
Channel* channel() const;

Powered by Google App Engine
This is Rietveld 408576698