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

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

Issue 12379071: Use multiple shared memory buffers cyclically for audio capture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: rebase Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_DEVICE_THREAD_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
6 #define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_ 6 #define MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/scoped_vector.h"
11 #include "base/shared_memory.h" 12 #include "base/shared_memory.h"
12 #include "base/sync_socket.h" 13 #include "base/sync_socket.h"
13 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
14 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
15 #include "media/audio/audio_parameters.h" 16 #include "media/audio/audio_parameters.h"
16 #include "media/audio/shared_memory_util.h" 17 #include "media/audio/shared_memory_util.h"
17 18
18 class MessageLoop; 19 class MessageLoop;
19 20
20 namespace media { 21 namespace media {
21 class AudioBus; 22 class AudioBus;
22 23
23 // Data transfer between browser and render process uses a combination 24 // Data transfer between browser and render process uses a combination
24 // of sync sockets and shared memory. To read from the socket and render 25 // of sync sockets and shared memory. To read from the socket and render
25 // data, we use a worker thread, a.k.a. the AudioDeviceThread, which reads 26 // data, we use a worker thread, a.k.a. the AudioDeviceThread, which reads
26 // data from the browser via the socket and fills the shared memory from the 27 // data from the browser via the socket and fills the shared memory from the
27 // audio thread via the AudioDeviceThread::Callback interface/class. 28 // audio thread via the AudioDeviceThread::Callback interface/class.
28 // For more details see the documentation in audio_device.h. 29 // For more details see the documentation in audio_device.h.
29 // 30 //
30 // TODO(tommi): Multiple audio input/output device instances should be able to 31 // TODO(tommi): Multiple audio input/output device instances should be able to
31 // share the same thread instead of spinning one per instance. 32 // share the same thread instead of spinning one per instance.
32 class MEDIA_EXPORT AudioDeviceThread { 33 class MEDIA_EXPORT AudioDeviceThread {
33 public: 34 public:
34 // This is the callback interface/base class that Audio[Output|Input]Device 35 // This is the callback interface/base class that Audio[Output|Input]Device
35 // implements to render input/output data. The callbacks run on the 36 // implements to render input/output data. The callbacks run on the
36 // thread owned by AudioDeviceThread. 37 // thread owned by AudioDeviceThread.
37 class Callback { 38 class Callback {
38 public: 39 public:
40 typedef std::vector<base::SharedMemoryHandle> SharedMemoryHandleVector;
41
39 Callback(const AudioParameters& audio_parameters, 42 Callback(const AudioParameters& audio_parameters,
40 base::SharedMemoryHandle memory, 43 SharedMemoryHandleVector& memory,
41 int memory_length); 44 int memory_length);
42 virtual ~Callback(); 45 virtual ~Callback();
43 46
44 // One time initialization for the callback object on the audio thread. 47 // One time initialization for the callback object on the audio thread.
45 void InitializeOnAudioThread(); 48 void InitializeOnAudioThread();
46 49
47 // Derived implementations must call shared_memory_.Map appropriately 50 // Derived implementations must call shared_memory_.Map appropriately
48 // before Process can be called. 51 // before Process can be called.
49 virtual void MapSharedMemory() = 0; 52 virtual void MapSharedMemory() = 0;
50 53
51 // Called whenever we receive notifications about pending data. 54 // Called whenever we receive notifications about pending data.
52 virtual void Process(int pending_data) = 0; 55 // The |index| states which shared memory buffer is used.
56 virtual void Process(int pending_data, int index) = 0;
53 57
54 protected: 58 protected:
55 // Protected so that derived classes can access directly. 59 // Protected so that derived classes can access directly.
56 // The variables are 'const' since values are calculated/set in the 60 // The variables are 'const' since values are calculated/set in the
57 // constructor and must never change. 61 // constructor and must never change.
58 const AudioParameters audio_parameters_; 62 const AudioParameters audio_parameters_;
59 const int samples_per_ms_; 63 const int samples_per_ms_;
60 const int bytes_per_ms_; 64 const int bytes_per_ms_;
61 65
62 base::SharedMemory shared_memory_; 66 ScopedVector<base::SharedMemory> shared_memory_;
63 const int memory_length_; 67 const int memory_length_;
64 68
65 private: 69 private:
66 DISALLOW_COPY_AND_ASSIGN(Callback); 70 DISALLOW_COPY_AND_ASSIGN(Callback);
67 }; 71 };
68 72
69 AudioDeviceThread(); 73 AudioDeviceThread(bool need_read_index);
70 ~AudioDeviceThread(); 74 ~AudioDeviceThread();
71 75
72 // Starts the audio thread. The thread must not already be running. 76 // Starts the audio thread. The thread must not already be running.
73 void Start(AudioDeviceThread::Callback* callback, 77 void Start(AudioDeviceThread::Callback* callback,
74 base::SyncSocket::Handle socket, 78 base::SyncSocket::Handle socket,
75 const char* thread_name); 79 const char* thread_name);
76 80
77 // This tells the audio thread to stop and clean up the data. 81 // This tells the audio thread to stop and clean up the data.
78 // The method can stop the thread synchronously or asynchronously. 82 // The method can stop the thread synchronously or asynchronously.
79 // In the latter case, the thread will still be running after Stop() 83 // In the latter case, the thread will still be running after Stop()
(...skipping 11 matching lines...) Expand all
91 private: 95 private:
92 // Our own private SimpleThread override. We implement this in a 96 // Our own private SimpleThread override. We implement this in a
93 // private class so that we get the following benefits: 97 // private class so that we get the following benefits:
94 // 1) AudioDeviceThread doesn't expose SimpleThread methods. 98 // 1) AudioDeviceThread doesn't expose SimpleThread methods.
95 // I.e. the caller can't call Start()/Stop() - which would be bad. 99 // I.e. the caller can't call Start()/Stop() - which would be bad.
96 // 2) We override ThreadMain to add additional on-thread initialization 100 // 2) We override ThreadMain to add additional on-thread initialization
97 // while still synchronized with SimpleThread::Start() to provide 101 // while still synchronized with SimpleThread::Start() to provide
98 // reliable initialization. 102 // reliable initialization.
99 class Thread; 103 class Thread;
100 104
105 // Flag indicating whether need to read index from sync socket.
106 bool need_read_index_;
107
101 base::Lock thread_lock_; 108 base::Lock thread_lock_;
102 scoped_refptr<AudioDeviceThread::Thread> thread_; 109 scoped_refptr<AudioDeviceThread::Thread> thread_;
103 110
104 DISALLOW_COPY_AND_ASSIGN(AudioDeviceThread); 111 DISALLOW_COPY_AND_ASSIGN(AudioDeviceThread);
105 }; 112 };
106 113
107 } // namespace media. 114 } // namespace media.
108 115
109 #endif // MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_ 116 #endif // MEDIA_AUDIO_AUDIO_DEVICE_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698