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

Side by Side Diff: media/audio/audio_output_stream_sink.h

Issue 1186943003: Revert of Add support for the audio-output-device switching IPC mechanism to the renderer lower... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « media/audio/audio_output_ipc.h ('k') | media/audio/audio_output_stream_sink.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
6 #define MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_ 6 #define MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
7 7
8 #include <string>
9
10 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
11 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
12 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
13 #include "media/audio/audio_io.h" 11 #include "media/audio/audio_io.h"
14 #include "media/base/audio_renderer_sink.h" 12 #include "media/base/audio_renderer_sink.h"
15 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
16 14
17 namespace media { 15 namespace media {
18 16
19 // Wrapper which exposes the browser side audio interface (AudioOutputStream) as 17 // Wrapper which exposes the browser side audio interface (AudioOutputStream) as
20 // if it were a renderer side audio interface (AudioRendererSink). Note: This 18 // if it were a renderer side audio interface (AudioRendererSink). Note: This
21 // will not work for sandboxed renderers. 19 // will not work for sandboxed renderers.
22 // 20 //
23 // TODO(dalecurtis): Delete this class once we have a proper mojo audio service; 21 // TODO(dalecurtis): Delete this class once we have a proper mojo audio service;
24 // tracked by http://crbug.com/425368 22 // tracked by http://crbug.com/425368
25 class MEDIA_EXPORT AudioOutputStreamSink 23 class MEDIA_EXPORT AudioOutputStreamSink
26 : NON_EXPORTED_BASE(public AudioRendererSink), 24 : NON_EXPORTED_BASE(public AudioRendererSink),
27 public AudioOutputStream::AudioSourceCallback { 25 public AudioOutputStream::AudioSourceCallback {
28 public: 26 public:
29 AudioOutputStreamSink(); 27 AudioOutputStreamSink();
30 28
31 // AudioRendererSink implementation. 29 // AudioRendererSink implementation.
32 void Initialize(const AudioParameters& params, 30 void Initialize(const AudioParameters& params,
33 RenderCallback* callback) override; 31 RenderCallback* callback) override;
34 void Start() override; 32 void Start() override;
35 void Stop() override; 33 void Stop() override;
36 void Pause() override; 34 void Pause() override;
37 void Play() override; 35 void Play() override;
38 bool SetVolume(double volume) override; 36 bool SetVolume(double volume) override;
39 void SwitchOutputDevice(const std::string& device_id,
40 const GURL& security_origin,
41 const SwitchOutputDeviceCB& callback) override;
42 37
43 // AudioSourceCallback implementation. 38 // AudioSourceCallback implementation.
44 int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) override; 39 int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) override;
45 void OnError(AudioOutputStream* stream) override; 40 void OnError(AudioOutputStream* stream) override;
46 41
47 private: 42 private:
48 ~AudioOutputStreamSink() override; 43 ~AudioOutputStreamSink() override;
49 44
50 // Helper methods for running AudioManager methods on the audio thread. 45 // Helper methods for running AudioManager methods on the audio thread.
51 void DoStart(); 46 void DoStart();
(...skipping 24 matching lines...) Expand all
76 // Lock and callback for forwarding OnMoreData() calls into Render() calls. 71 // Lock and callback for forwarding OnMoreData() calls into Render() calls.
77 base::Lock callback_lock_; 72 base::Lock callback_lock_;
78 RenderCallback* active_render_callback_; 73 RenderCallback* active_render_callback_;
79 74
80 DISALLOW_COPY_AND_ASSIGN(AudioOutputStreamSink); 75 DISALLOW_COPY_AND_ASSIGN(AudioOutputStreamSink);
81 }; 76 };
82 77
83 } // namepace media 78 } // namepace media
84 79
85 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_ 80 #endif // MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_ipc.h ('k') | media/audio/audio_output_stream_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698