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

Side by Side Diff: components/copresence/mediums/audio/audio_player_impl.h

Issue 637223011: Redesign the copresence audio handlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 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 COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_H_ 5 #ifndef COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_IMPL_H_
6 #define COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_H_ 6 #define COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "components/copresence/mediums/audio/audio_player.h"
14 #include "media/audio/audio_io.h" 15 #include "media/audio/audio_io.h"
15 16
16 namespace media { 17 namespace media {
17 class AudioBus; 18 class AudioBus;
18 class AudioBusRefCounted; 19 class AudioBusRefCounted;
19 } 20 }
20 21
21 namespace copresence { 22 namespace copresence {
22 23
23 // The AudioPlayer class will play a set of samples till it is told to stop. 24 // The AudioPlayerImpl class will play a set of samples till it is told to stop.
24 class AudioPlayer : public media::AudioOutputStream::AudioSourceCallback { 25 class AudioPlayerImpl final
26 : public AudioPlayer,
27 public media::AudioOutputStream::AudioSourceCallback {
25 public: 28 public:
26 AudioPlayer(); 29 AudioPlayerImpl();
27 30
28 // Initializes the object. Do not use this object before calling this method. 31 // AudioPlayer overrides:
29 virtual void Initialize(); 32 void Initialize() override;
30 33 void Play(const scoped_refptr<media::AudioBusRefCounted>& samples) override;
31 // Play the given samples. These samples will keep on being played in a loop 34 void Stop() override;
32 // till we explicitly tell the player to stop playing. 35 void Finalize() override;
33 virtual void Play(const scoped_refptr<media::AudioBusRefCounted>& samples); 36 bool IsPlaying() override;
34
35 // Stop playing.
36 virtual void Stop();
37
38 // Cleans up and deletes this object. Do not use object after this call.
39 virtual void Finalize();
40
41 bool IsPlaying();
42 37
43 // Takes ownership of the stream. 38 // Takes ownership of the stream.
44 void set_output_stream_for_testing( 39 void set_output_stream_for_testing(
45 media::AudioOutputStream* output_stream_for_testing) { 40 media::AudioOutputStream* output_stream_for_testing) {
46 output_stream_for_testing_.reset(output_stream_for_testing); 41 output_stream_for_testing_.reset(output_stream_for_testing);
47 } 42 }
48 43
49 protected:
50 ~AudioPlayer() override;
51 void set_is_playing(bool is_playing) { is_playing_ = is_playing; }
52
53 private: 44 private:
54 friend class AudioPlayerTest; 45 friend class AudioPlayerTest;
55 FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, BasicPlayAndStop); 46 FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, BasicPlayAndStop);
56 FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, OutOfOrderPlayAndStopMultiple); 47 FRIEND_TEST_ALL_PREFIXES(AudioPlayerTest, OutOfOrderPlayAndStopMultiple);
57 48
49 virtual ~AudioPlayerImpl();
50
58 // Methods to do our various operations; all of these need to be run on the 51 // Methods to do our various operations; all of these need to be run on the
59 // audio thread. 52 // audio thread.
60 void InitializeOnAudioThread(); 53 void InitializeOnAudioThread();
61 void PlayOnAudioThread( 54 void PlayOnAudioThread(
62 const scoped_refptr<media::AudioBusRefCounted>& samples); 55 const scoped_refptr<media::AudioBusRefCounted>& samples);
63 void StopOnAudioThread(); 56 void StopOnAudioThread();
64 void StopAndCloseOnAudioThread(); 57 void StopAndCloseOnAudioThread();
65 void FinalizeOnAudioThread(); 58 void FinalizeOnAudioThread();
66 59
67 // AudioOutputStream::AudioSourceCallback overrides: 60 // AudioOutputStream::AudioSourceCallback overrides:
(...skipping 13 matching lines...) Expand all
81 scoped_ptr<media::AudioOutputStream> output_stream_for_testing_; 74 scoped_ptr<media::AudioOutputStream> output_stream_for_testing_;
82 75
83 // All fields below here are protected by this lock. 76 // All fields below here are protected by this lock.
84 base::Lock state_lock_; 77 base::Lock state_lock_;
85 78
86 scoped_refptr<media::AudioBusRefCounted> samples_; 79 scoped_refptr<media::AudioBusRefCounted> samples_;
87 80
88 // Index to the frame in the samples that we need to play next. 81 // Index to the frame in the samples that we need to play next.
89 int frame_index_; 82 int frame_index_;
90 83
91 DISALLOW_COPY_AND_ASSIGN(AudioPlayer); 84 DISALLOW_COPY_AND_ASSIGN(AudioPlayerImpl);
92 }; 85 };
93 86
94 } // namespace copresence 87 } // namespace copresence
95 88
96 #endif // COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_H_ 89 #endif // COMPONENTS_COPRESENCE_MEDIUMS_AUDIO_AUDIO_PLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « components/copresence/mediums/audio/audio_player.cc ('k') | components/copresence/mediums/audio/audio_player_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698