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

Side by Side Diff: content/browser/renderer_host/media/audio_input_sync_writer.h

Issue 314713002: Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed SpeechRecognitionBrowserTest Created 6 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 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 CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
7 7
8 #include "base/memory/scoped_vector.h"
8 #include "base/process/process.h" 9 #include "base/process/process.h"
9 #include "base/sync_socket.h" 10 #include "base/sync_socket.h"
10 #include "base/time/time.h" 11 #include "base/time/time.h"
11 #include "media/audio/audio_input_controller.h" 12 #include "media/audio/audio_input_controller.h"
13 #include "media/audio/audio_parameters.h"
14 #include "media/base/audio_bus.h"
12 15
13 #if defined(OS_POSIX) 16 #if defined(OS_POSIX)
14 #include "base/file_descriptor_posix.h" 17 #include "base/file_descriptor_posix.h"
15 #endif 18 #endif
16 19
17 namespace base { 20 namespace base {
18 class SharedMemory; 21 class SharedMemory;
19 } 22 }
20 23
21 namespace content { 24 namespace content {
22 // A AudioInputController::SyncWriter implementation using SyncSocket. This 25 // A AudioInputController::SyncWriter implementation using SyncSocket. This
23 // is used by AudioInputController to provide a low latency data source for 26 // is used by AudioInputController to provide a low latency data source for
24 // transmitting audio packets between the browser process and the renderer 27 // transmitting audio packets between the browser process and the renderer
25 // process. 28 // process.
26 class AudioInputSyncWriter : public media::AudioInputController::SyncWriter { 29 class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
27 public: 30 public:
28 explicit AudioInputSyncWriter(base::SharedMemory* shared_memory, 31 explicit AudioInputSyncWriter(base::SharedMemory* shared_memory,
29 int shared_memory_segment_count); 32 int shared_memory_segment_count,
33 const media::AudioParameters& params);
30 34
31 virtual ~AudioInputSyncWriter(); 35 virtual ~AudioInputSyncWriter();
32 36
33 // media::AudioOutputController::SyncWriter implementation. 37 // media::AudioInputController::SyncWriter implementation.
34 virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE; 38 virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE;
35 virtual uint32 Write(const void* data, 39 virtual void Write(const media::AudioBus* data,
36 uint32 size, 40 double volume,
37 double volume, 41 bool key_pressed) OVERRIDE;
38 bool key_pressed) OVERRIDE;
39 virtual void Close() OVERRIDE; 42 virtual void Close() OVERRIDE;
40 43
41 bool Init(); 44 bool Init();
42 bool PrepareForeignSocketHandle(base::ProcessHandle process_handle, 45 bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
43 #if defined(OS_WIN) 46 #if defined(OS_WIN)
44 base::SyncSocket::Handle* foreign_handle); 47 base::SyncSocket::Handle* foreign_handle);
45 #else 48 #else
46 base::FileDescriptor* foreign_handle); 49 base::FileDescriptor* foreign_handle);
47 #endif 50 #endif
48 51
49 private: 52 private:
50 base::SharedMemory* shared_memory_; 53 base::SharedMemory* shared_memory_;
51 uint32 shared_memory_segment_size_; 54 uint32 shared_memory_segment_size_;
52 uint32 shared_memory_segment_count_; 55 uint32 shared_memory_segment_count_;
53 uint32 current_segment_id_; 56 uint32 current_segment_id_;
54 57
55 // Socket for transmitting audio data. 58 // Socket for transmitting audio data.
56 scoped_ptr<base::CancelableSyncSocket> socket_; 59 scoped_ptr<base::CancelableSyncSocket> socket_;
57 60
58 // Socket to be used by the renderer. The reference is released after 61 // Socket to be used by the renderer. The reference is released after
59 // PrepareForeignSocketHandle() is called and ran successfully. 62 // PrepareForeignSocketHandle() is called and ran successfully.
60 scoped_ptr<base::CancelableSyncSocket> foreign_socket_; 63 scoped_ptr<base::CancelableSyncSocket> foreign_socket_;
61 64
62 // The time of the creation of this object. 65 // The time of the creation of this object.
63 base::Time creation_time_; 66 base::Time creation_time_;
64 67
65 // The time of the last Write call. 68 // The time of the last Write call.
66 base::Time last_write_time_; 69 base::Time last_write_time_;
67 70
71 // Size in bytes of each audio bus.
72 const int audio_bus_memory_size_;
73
74 // Vector of audio buses allocated during construction and deleted in the
75 // destructor.
76 ScopedVector<media::AudioBus> audio_buses_;
77
68 DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputSyncWriter); 78 DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputSyncWriter);
69 }; 79 };
70 80
71 } // namespace content 81 } // namespace content
72 82
73 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_ 83 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698