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

Unified Diff: media/audio/fake_audio_input_stream.h

Issue 9692038: stopping the audio thread before destroying the AudioManager<Platform> (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the speech recognition unittest Created 8 years, 9 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/fake_audio_input_stream.h
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h
index 1619374e3cd34735ed940f4af3f976ff8c768801..99668e8be840c608dd4e701e95d3b7a89a8572c5 100644
--- a/media/audio/fake_audio_input_stream.h
+++ b/media/audio/fake_audio_input_stream.h
@@ -9,18 +9,19 @@
#include <vector>
-#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
#include "base/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
+class AudioManagerBase;
+
class MEDIA_EXPORT FakeAudioInputStream
- : public AudioInputStream,
- public base::RefCountedThreadSafe<FakeAudioInputStream> {
+ : public AudioInputStream {
public:
- static AudioInputStream* MakeFakeStream(const AudioParameters& params);
+ static AudioInputStream* MakeFakeStream(AudioManagerBase* manager,
+ const AudioParameters& params);
virtual bool Open() OVERRIDE;
virtual void Start(AudioInputCallback* callback) OVERRIDE;
@@ -31,14 +32,14 @@ class MEDIA_EXPORT FakeAudioInputStream
virtual double GetVolume() OVERRIDE;
private:
- // Give RefCountedThreadSafe access our destructor.
- friend class base::RefCountedThreadSafe<FakeAudioInputStream>;
+ FakeAudioInputStream(AudioManagerBase* manager,
+ const AudioParameters& params);
- FakeAudioInputStream(const AudioParameters& params);
virtual ~FakeAudioInputStream();
void DoCallback();
+ AudioManagerBase* audio_manager_;
AudioInputCallback* callback_;
scoped_array<uint8> buffer_;
int buffer_size_;

Powered by Google App Engine
This is Rietveld 408576698