Commit cce6c353 authored by burnik's avatar burnik Committed by Commit bot

Binding media stream audio track to speech recognition - bugfix.

Shared memory initialization in unit test.

BUG=408940, 422164
TEST=Memory bot for content_unittests

Review URL: https://codereview.chromium.org/649613002

Cr-Commit-Position: refs/heads/master@{#299101}
parent f49625ca
...@@ -116,11 +116,12 @@ class FakeSpeechRecognizer { ...@@ -116,11 +116,12 @@ class FakeSpeechRecognizer {
const media::AudioParameters& sink_params, const media::AudioParameters& sink_params,
base::SharedMemoryHandle* foreign_memory_handle) { base::SharedMemoryHandle* foreign_memory_handle) {
// Shared memory is allocated, mapped and shared. // Shared memory is allocated, mapped and shared.
uint32 shared_memory_size = const uint32 kSharedMemorySize =
sizeof(media::AudioInputBufferParameters) + sizeof(media::AudioInputBufferParameters) +
media::AudioBus::CalculateMemorySize(sink_params); media::AudioBus::CalculateMemorySize(sink_params);
shared_memory_.reset(new base::SharedMemory()); shared_memory_.reset(new base::SharedMemory());
ASSERT_TRUE(shared_memory_->CreateAndMapAnonymous(shared_memory_size)); ASSERT_TRUE(shared_memory_->CreateAndMapAnonymous(kSharedMemorySize));
memset(shared_memory_->memory(), 0, kSharedMemorySize);
ASSERT_TRUE(shared_memory_->ShareToProcess(base::GetCurrentProcessHandle(), ASSERT_TRUE(shared_memory_->ShareToProcess(base::GetCurrentProcessHandle(),
foreign_memory_handle)); foreign_memory_handle));
......
...@@ -1860,8 +1860,3 @@ pdf.dll!pp::InputEvent_HandleEvent ...@@ -1860,8 +1860,3 @@ pdf.dll!pp::InputEvent_HandleEvent
ppapi_proxy.dll!ppapi::CallWhileUnlocked<> ppapi_proxy.dll!ppapi::CallWhileUnlocked<>
ppapi_proxy.dll!ppapi::proxy::PPP_InputEvent_Proxy::OnMsgHandleFilteredInputEvent ppapi_proxy.dll!ppapi::proxy::PPP_InputEvent_Proxy::OnMsgHandleFilteredInputEvent
UNINITIALIZED READ
name=bug_422164
...
content.dll!content::WebRtcLocalAudioTrack::Capture
*!content::SpeechRecognitionAudioSinkTest*
...@@ -3485,10 +3485,3 @@ ...@@ -3485,10 +3485,3 @@
fun:_ZNSt4listI13scoped_refptrIN5media10VideoFrameEESaIS3_EE9push_backERKS3_ fun:_ZNSt4listI13scoped_refptrIN5media10VideoFrameEESaIS3_EE9push_backERKS3_
fun:_ZN5media14VideoFramePool8PoolImpl13FrameReleasedERK13scoped_refptrINS_10VideoFrameEE fun:_ZN5media14VideoFramePool8PoolImpl13FrameReleasedERK13scoped_refptrINS_10VideoFrameEE
} }
{
bug_422164
Memcheck:Uninitialized
...
fun:_ZN7content21WebRtcLocalAudioTrack7CaptureEPKsN4base9TimeDeltaEibb
fun:_ZN7content30SpeechRecognitionAudioSinkTest*
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment