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

Unified Diff: media/audio/audio_output_controller.h

Issue 1897953003: Unmute Tab Audio For Desktop Share (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unittest 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
Index: media/audio/audio_output_controller.h
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 1f5c358ae3cedc04cc4ca90ea3aeb468ff7b335f..be99bca9233e4c7eeaa9962aa18b64594d86fbda 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -6,8 +6,8 @@
#define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
#include <stdint.h>
-
#include <memory>
+#include <set>
#include "base/atomic_ref_count.h"
#include "base/callback.h"
@@ -21,6 +21,7 @@
#include "media/audio/audio_power_monitor.h"
#include "media/audio/audio_source_diverter.h"
#include "media/audio/simple_sources.h"
+#include "media/audio/virtual_audio_sink.h"
miu 2016/05/06 22:29:50 You can remove this #include now that AudioPushSin
qiangchen 2016/05/10 22:36:53 Done.
#include "media/base/media_export.h"
// An AudioOutputController controls an AudioOutputStream and provides data
@@ -178,6 +179,8 @@ class MEDIA_EXPORT AudioOutputController
const AudioParameters& GetAudioParameters() override;
void StartDiverting(AudioOutputStream* to_stream) override;
void StopDiverting() override;
+ void StartDuplicating(AudioPushSink* sink) override;
+ void StopDuplicating(AudioPushSink* sink) override;
// Accessor for AudioPowerMonitor::ReadCurrentPowerAndClip(). See comments in
// audio_power_monitor.h for usage. This may be called on any thread.
@@ -218,6 +221,8 @@ class MEDIA_EXPORT AudioOutputController
void DoReportError();
void DoStartDiverting(AudioOutputStream* to_stream);
void DoStopDiverting();
+ void DoStartDuplicating(AudioPushSink* sink);
+ void DoStopDuplicating(AudioPushSink* sink);
// Helper method that stops the physical stream.
void StopStream();
@@ -241,6 +246,9 @@ class MEDIA_EXPORT AudioOutputController
// When non-NULL, audio is being diverted to this stream.
AudioOutputStream* diverting_to_stream_;
+ // The targets for audio stream to be copied to.
+ std::set<AudioPushSink*> duplication_targets_;
+
// The current volume of the audio stream.
double volume_;

Powered by Google App Engine
This is Rietveld 408576698