diff options
Diffstat (limited to 'content/browser/renderer_host')
5 files changed, 23 insertions, 41 deletions
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc index 1c02109..4a2f731 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc @@ -51,12 +51,11 @@ AudioInputRendererHost::AudioEntry::~AudioEntry() {} AudioInputRendererHost::AudioInputRendererHost( media::AudioManager* audio_manager, MediaStreamManager* media_stream_manager, - AudioMirroringManager* audio_mirroring_manager, - media::UserInputMonitor* user_input_monitor) + AudioMirroringManager* audio_mirroring_manager) : audio_manager_(audio_manager), media_stream_manager_(media_stream_manager), - audio_mirroring_manager_(audio_mirroring_manager), - user_input_monitor_(user_input_monitor) {} + audio_mirroring_manager_(audio_mirroring_manager) { +} AudioInputRendererHost::~AudioInputRendererHost() { DCHECK(audio_entries_.empty()); @@ -273,23 +272,20 @@ void AudioInputRendererHost::OnCreateStream( entry->controller = media::AudioInputController::CreateForStream( audio_manager_->GetMessageLoop(), this, - WebContentsAudioInputStream::Create(device_id, - audio_params, - audio_manager_->GetWorkerLoop(), - audio_mirroring_manager_), - entry->writer.get(), - user_input_monitor_); + WebContentsAudioInputStream::Create( + device_id, audio_params, audio_manager_->GetWorkerLoop(), + audio_mirroring_manager_), + entry->writer.get()); } else { // TODO(henrika): replace CreateLowLatency() with Create() as soon // as satish has ensured that Speech Input also uses the default low- // latency path. See crbug.com/112472 for details. - entry->controller = - media::AudioInputController::CreateLowLatency(audio_manager_, - this, - audio_params, - device_id, - entry->writer.get(), - user_input_monitor_); + entry->controller = media::AudioInputController::CreateLowLatency( + audio_manager_, + this, + audio_params, + device_id, + entry->writer.get()); } if (!entry->controller.get()) { diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index 5df1fc6..d16ebfa 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -44,7 +44,6 @@ namespace media { class AudioManager; class AudioParameters; -class UserInputMonitor; } namespace content { @@ -56,11 +55,10 @@ class CONTENT_EXPORT AudioInputRendererHost public media::AudioInputController::EventHandler { public: // Called from UI thread from the owner of this object. - // |user_input_monitor| is used for typing detection and can be NULL. - AudioInputRendererHost(media::AudioManager* audio_manager, - MediaStreamManager* media_stream_manager, - AudioMirroringManager* audio_mirroring_manager, - media::UserInputMonitor* user_input_monitor); + AudioInputRendererHost( + media::AudioManager* audio_manager, + MediaStreamManager* media_stream_manager, + AudioMirroringManager* audio_mirroring_manager); // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; @@ -156,9 +154,6 @@ class CONTENT_EXPORT AudioInputRendererHost // A map of stream IDs to audio sources. AudioEntryMap audio_entries_; - // Raw pointer of the UserInputMonitor. - media::UserInputMonitor* user_input_monitor_; - DISALLOW_COPY_AND_ASSIGN(AudioInputRendererHost); }; diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.cc b/content/browser/renderer_host/media/audio_input_sync_writer.cc index 369e0a8..572abf3 100644 --- a/content/browser/renderer_host/media/audio_input_sync_writer.cc +++ b/content/browser/renderer_host/media/audio_input_sync_writer.cc @@ -29,17 +29,14 @@ void AudioInputSyncWriter::UpdateRecordedBytes(uint32 bytes) { socket_->Send(&bytes, sizeof(bytes)); } -uint32 AudioInputSyncWriter::Write(const void* data, - uint32 size, - double volume, - bool key_pressed) { +uint32 AudioInputSyncWriter::Write( + const void* data, uint32 size, double volume) { uint8* ptr = static_cast<uint8*>(shared_memory_->memory()); ptr += current_segment_id_ * shared_memory_segment_size_; media::AudioInputBuffer* buffer = reinterpret_cast<media::AudioInputBuffer*>(ptr); buffer->params.volume = volume; buffer->params.size = size; - buffer->params.key_pressed = key_pressed; memcpy(buffer->audio, data, size); if (++current_segment_id_ >= shared_memory_segment_count_) diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h index d16911f..4cfe9e3 100644 --- a/content/browser/renderer_host/media/audio_input_sync_writer.h +++ b/content/browser/renderer_host/media/audio_input_sync_writer.h @@ -28,10 +28,7 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter { // media::AudioOutputController::SyncWriter implementation. virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE; - virtual uint32 Write(const void* data, - uint32 size, - double volume, - bool key_pressed) OVERRIDE; + virtual uint32 Write(const void* data, uint32 size, double volume) OVERRIDE; virtual void Close() OVERRIDE; bool Init(); diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 3b22bc8..e31aff2 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -617,14 +617,11 @@ void RenderProcessHostImpl::CreateMessageFilters() { channel_->AddFilter(new AudioInputRendererHost( audio_manager, media_stream_manager, - BrowserMainLoop::GetInstance()->audio_mirroring_manager(), - BrowserMainLoop::GetInstance()->user_input_monitor())); + BrowserMainLoop::GetInstance()->audio_mirroring_manager())); channel_->AddFilter(new AudioRendererHost( - GetID(), - audio_manager, + GetID(), audio_manager, BrowserMainLoop::GetInstance()->audio_mirroring_manager(), - media_internals, - media_stream_manager)); + media_internals, media_stream_manager)); channel_->AddFilter( new MIDIHost(BrowserMainLoop::GetInstance()->midi_manager())); channel_->AddFilter(new MIDIDispatcherHost(GetID(), browser_context)); |