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

Unified Diff: media/audio/virtual_audio_output_stream.h

Issue 17334005: Re-land r207105 (Mac audio capture threading fix) with unit test memory leak issue resolved. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using ref-counting (Patch Set 2 from Issue 17122006). Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/virtual_audio_input_stream_unittest.cc ('k') | media/audio/virtual_audio_output_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/virtual_audio_output_stream.h
diff --git a/media/audio/virtual_audio_output_stream.h b/media/audio/virtual_audio_output_stream.h
index 32afe30eb0184650bfbfc438c650aabf5cd89f50..0df6d5b2f75c97cd138296225207269fd5ffed2b 100644
--- a/media/audio/virtual_audio_output_stream.h
+++ b/media/audio/virtual_audio_output_stream.h
@@ -6,14 +6,11 @@
#define MEDIA_AUDIO_VIRTUAL_AUDIO_OUTPUT_STREAM_H_
#include "base/callback.h"
+#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_converter.h"
-namespace base {
-class MessageLoopProxy;
-}
-
namespace media {
class VirtualAudioInputStream;
@@ -34,7 +31,6 @@ class MEDIA_EXPORT VirtualAudioOutputStream
// Construct an audio loopback pathway to the given |target| (not owned).
// |target| must outlive this instance.
VirtualAudioOutputStream(const AudioParameters& params,
- base::MessageLoopProxy* message_loop,
VirtualAudioInputStream* target,
const AfterCloseCallback& after_close_cb);
@@ -54,7 +50,6 @@ class MEDIA_EXPORT VirtualAudioOutputStream
base::TimeDelta buffer_delay) OVERRIDE;
const AudioParameters params_;
- base::MessageLoopProxy* const message_loop_;
// Pointer to the VirtualAudioInputStream to attach to when Start() is called.
// This pointer should always be valid because VirtualAudioInputStream should
// outlive this class.
@@ -65,6 +60,8 @@ class MEDIA_EXPORT VirtualAudioOutputStream
AudioSourceCallback* callback_;
double volume_;
+ base::ThreadChecker thread_checker_;
+
DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStream);
};
« no previous file with comments | « media/audio/virtual_audio_input_stream_unittest.cc ('k') | media/audio/virtual_audio_output_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698