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

Unified Diff: webrtc/audio/audio_receive_stream.h

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: forgot dependency. Created 4 years, 1 month 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/audio/audio_receive_stream.h
diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
index 906ddb626d6aa8d5d675154ca3e6d3812944163a..475976c915ba6d2b82557c06aa2bca8c7ecb63d3 100644
--- a/webrtc/audio/audio_receive_stream.h
+++ b/webrtc/audio/audio_receive_stream.h
@@ -16,6 +16,7 @@
#include "webrtc/api/audio/audio_mixer.h"
#include "webrtc/api/call/audio_receive_stream.h"
#include "webrtc/api/call/audio_state.h"
+#include "webrtc/audio/audio_state.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
@@ -62,6 +63,7 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream,
private:
VoiceEngine* voice_engine() const;
+ AudioState* audio_state() const;
rtc::ThreadChecker thread_checker_;
RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr;
@@ -70,6 +72,8 @@ class AudioReceiveStream final : public webrtc::AudioReceiveStream,
std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
std::unique_ptr<voe::ChannelProxy> channel_proxy_;
+ bool playing_ ACCESS_ON(thread_checker_) = false;
+
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
};
} // namespace internal

Powered by Google App Engine
This is Rietveld 408576698