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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/channel.h

Issue 1986093002: Propagate muted info from VoE Channel to AudioConferenceMixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer-mod-3
Patch Set: Created 4 years, 7 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
« webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h ('K') | « webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index ac49e287521a917085f1490f43d36a094e8695fa..7bde5e98ec09567ec9e16c4c2b0f648e13c17814 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -394,7 +394,11 @@ class Channel
bool SendRtcp(const uint8_t* data, size_t len) override;
// From MixerParticipant
- int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override;
+ int32_t GetAudioFrame(int32_t id,
+ AudioFrame* audioFrame) override;
+ int32_t GetAudioFrameWithMuted(int32_t id,
+ AudioFrame* audioFrame,
+ bool* muted) override;
int32_t NeededFrequency(int32_t id) const override;
// From FileCallback
« webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h ('K') | « webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698