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

Side by Side Diff: chromecast/media/audio/cast_audio_manager.h

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: fixes content_browsertests and content_unittests Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_ 5 #ifndef CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_
6 #define CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_ 6 #define CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "media/audio/audio_manager_base.h" 9 #include "media/audio/audio_manager_base.h"
10 10
(...skipping 12 matching lines...) Expand all
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 23 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
24 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, 24 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
25 ::media::AudioLogFactory* audio_log_factory, 25 ::media::AudioLogFactory* audio_log_factory,
26 MediaPipelineBackendManager* backend_manager); 26 MediaPipelineBackendManager* backend_manager);
27 CastAudioManager( 27 CastAudioManager(
28 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 28 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
29 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, 29 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
30 ::media::AudioLogFactory* audio_log_factory, 30 ::media::AudioLogFactory* audio_log_factory,
31 MediaPipelineBackendManager* backend_manager, 31 MediaPipelineBackendManager* backend_manager,
32 CastAudioMixer* audio_mixer); 32 CastAudioMixer* audio_mixer);
33 ~CastAudioManager() override;
33 34
34 // AudioManager implementation. 35 // AudioManager implementation.
35 bool HasAudioOutputDevices() override; 36 bool HasAudioOutputDevices() override;
36 bool HasAudioInputDevices() override; 37 bool HasAudioInputDevices() override;
37 void ShowAudioInputSettings() override; 38 void ShowAudioInputSettings() override;
38 void GetAudioInputDeviceNames( 39 void GetAudioInputDeviceNames(
39 ::media::AudioDeviceNames* device_names) override; 40 ::media::AudioDeviceNames* device_names) override;
40 ::media::AudioParameters GetInputStreamParameters( 41 ::media::AudioParameters GetInputStreamParameters(
41 const std::string& device_id) override; 42 const std::string& device_id) override;
42 const char* GetName() override; 43 const char* GetName() override;
43 44
44 // AudioManagerBase implementation 45 // AudioManagerBase implementation
45 void ReleaseOutputStream(::media::AudioOutputStream* stream) override; 46 void ReleaseOutputStream(::media::AudioOutputStream* stream) override;
46 47
47 // This must be called on audio thread. 48 // This must be called on audio thread.
48 virtual std::unique_ptr<MediaPipelineBackend> CreateMediaPipelineBackend( 49 virtual std::unique_ptr<MediaPipelineBackend> CreateMediaPipelineBackend(
49 const MediaPipelineDeviceParams& params); 50 const MediaPipelineDeviceParams& params);
50 51
51 protected:
52 ~CastAudioManager() override;
53
54 private: 52 private:
55 // AudioManagerBase implementation. 53 // AudioManagerBase implementation.
56 ::media::AudioOutputStream* MakeLinearOutputStream( 54 ::media::AudioOutputStream* MakeLinearOutputStream(
57 const ::media::AudioParameters& params, 55 const ::media::AudioParameters& params,
58 const ::media::AudioManager::LogCallback& log_callback) override; 56 const ::media::AudioManager::LogCallback& log_callback) override;
59 ::media::AudioOutputStream* MakeLowLatencyOutputStream( 57 ::media::AudioOutputStream* MakeLowLatencyOutputStream(
60 const ::media::AudioParameters& params, 58 const ::media::AudioParameters& params,
61 const std::string& device_id, 59 const std::string& device_id,
62 const ::media::AudioManager::LogCallback& log_callback) override; 60 const ::media::AudioManager::LogCallback& log_callback) override;
63 ::media::AudioInputStream* MakeLinearInputStream( 61 ::media::AudioInputStream* MakeLinearInputStream(
(...skipping 16 matching lines...) Expand all
80 std::unique_ptr<::media::AudioOutputStream> mixer_output_stream_; 78 std::unique_ptr<::media::AudioOutputStream> mixer_output_stream_;
81 std::unique_ptr<CastAudioMixer> mixer_; 79 std::unique_ptr<CastAudioMixer> mixer_;
82 80
83 DISALLOW_COPY_AND_ASSIGN(CastAudioManager); 81 DISALLOW_COPY_AND_ASSIGN(CastAudioManager);
84 }; 82 };
85 83
86 } // namespace media 84 } // namespace media
87 } // namespace chromecast 85 } // namespace chromecast
88 86
89 #endif // CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_ 87 #endif // CHROMECAST_MEDIA_AUDIO_CAST_AUDIO_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698