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

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: Created 4 years, 8 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 58e1e458a97e1ec06b5157706a62940919b7d2cc..bf5cfe77caed567cc680eaf2c5e796515df1e7a1 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -6,6 +6,7 @@
#define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
#include <stdint.h>
+#include <set>
#include "base/atomic_ref_count.h"
#include "base/callback.h"
@@ -19,6 +20,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"
#include "media/base/media_export.h"
// An AudioOutputController controls an AudioOutputStream and provides data
@@ -57,6 +59,8 @@
namespace media {
+class VirtualAudioSink;
miu 2016/04/21 00:15:25 I think you intended to remove this (since it's no
qiangchen 2016/04/28 00:00:56 Done.
+
class MEDIA_EXPORT AudioOutputController
: public base::RefCountedThreadSafe<AudioOutputController>,
public AudioOutputStream::AudioSourceCallback,
@@ -176,6 +180,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.
@@ -216,12 +222,14 @@ 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();
// Helper method that stops, closes, and NULLs |*stream_|.
- void DoStopCloseAndClearStream();
+ void DoStopCloseAndClearStream(bool isForDeviceChange);
// Checks if a stream was started successfully but never calls OnMoreData().
void WedgeCheck();
@@ -239,6 +247,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*> duplicating_targets_;
+
// The current volume of the audio stream.
double volume_;

Powered by Google App Engine
This is Rietveld 408576698