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

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

Issue 510913005: Add native log and uma stat when all input shared memory buffers are full (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 #include "content/browser/renderer_host/media/audio_input_sync_writer.h" 5 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/memory/shared_memory.h" 9 #include "base/memory/shared_memory.h"
10 #include "base/metrics/histogram.h"
11 #include "base/strings/string_number_conversions.h"
10 #include "content/browser/renderer_host/media/media_stream_manager.h" 12 #include "content/browser/renderer_host/media/media_stream_manager.h"
11 13
12 using media::AudioBus; 14 using media::AudioBus;
13 15
14 namespace content { 16 namespace content {
15 17
18 namespace {
19
20 enum AudioInputBufferType {
21 MEDIA_INPUT_SINGLE_BUFFER = 0,
tommi (sloooow) - chröme 2014/08/29 09:16:43 nit: can we include 'AUDIO' in the enum names? E.
no longer working on chromium 2014/08/29 11:14:16 Ah, good catch. I changed the name from MediaInput
22 MEDIA_INPUT_CIRCULAR_BUFFER = 1,
23 NUM_MEDIA_INPUT_BUFFER
24 };
25
26 // Log to native log and uma stats that all the buffers are full.
27 void LogAllBuffersAreFull(int shared_memory_segment_size) {
tommi (sloooow) - chröme 2014/08/29 09:16:42 |shared_memory_segment_size| sounds to me to repre
no longer working on chromium 2014/08/29 11:14:16 shared_memory_segment_size_ is used by AudioInputS
28 AudioInputBufferType type = MEDIA_INPUT_SINGLE_BUFFER;
29 if (shared_memory_segment_size != 1) {
30 type = MEDIA_INPUT_CIRCULAR_BUFFER;
tommi (sloooow) - chröme 2014/08/29 09:16:42 spacing
no longer working on chromium 2014/08/29 11:14:16 Done.
31 const std::string log =
32 "AIS, circular buffers is full. Number of buffers is " +
tommi (sloooow) - chröme 2014/08/29 09:16:42 grammar nit: circular buffers are full
no longer working on chromium 2014/08/29 11:14:16 Done.
33 base::IntToString(shared_memory_segment_size);
tommi (sloooow) - chröme 2014/08/29 09:16:42 nit: use StringPrintf() (fewer string objects requ
no longer working on chromium 2014/08/29 11:14:16 Done.
34 MediaStreamManager::SendMessageToNativeLog(log);
35 }
36 UMA_HISTOGRAM_ENUMERATION("Media.AudioInputSyncWriterBuffersAreFull",
37 type,
38 NUM_MEDIA_INPUT_BUFFER);
39 }
40
41 }
16 AudioInputSyncWriter::AudioInputSyncWriter(base::SharedMemory* shared_memory, 42 AudioInputSyncWriter::AudioInputSyncWriter(base::SharedMemory* shared_memory,
tommi (sloooow) - chröme 2014/08/29 09:16:42 empty line above this one
no longer working on chromium 2014/08/29 11:14:16 Done.
17 int shared_memory_segment_count, 43 int shared_memory_segment_count,
18 const media::AudioParameters& params) 44 const media::AudioParameters& params)
19 : shared_memory_(shared_memory), 45 : shared_memory_(shared_memory),
20 shared_memory_segment_count_(shared_memory_segment_count), 46 shared_memory_segment_count_(shared_memory_segment_count),
21 current_segment_id_(0), 47 current_segment_id_(0),
22 creation_time_(base::Time::Now()), 48 creation_time_(base::Time::Now()),
23 audio_bus_memory_size_(AudioBus::CalculateMemorySize(params)) { 49 audio_bus_memory_size_(AudioBus::CalculateMemorySize(params)) {
24 DCHECK_GT(shared_memory_segment_count, 0); 50 DCHECK_GT(shared_memory_segment_count, 0);
25 DCHECK_EQ(shared_memory->requested_size() % shared_memory_segment_count, 0u); 51 DCHECK_EQ(shared_memory->requested_size() % shared_memory_segment_count, 0u);
26 shared_memory_segment_size_ = 52 shared_memory_segment_size_ =
(...skipping 10 matching lines...) Expand all
37 reinterpret_cast<media::AudioInputBuffer*>(ptr); 63 reinterpret_cast<media::AudioInputBuffer*>(ptr);
38 scoped_ptr<media::AudioBus> audio_bus = 64 scoped_ptr<media::AudioBus> audio_bus =
39 media::AudioBus::WrapMemory(params, buffer->audio); 65 media::AudioBus::WrapMemory(params, buffer->audio);
40 audio_buses_.push_back(audio_bus.release()); 66 audio_buses_.push_back(audio_bus.release());
41 ptr += shared_memory_segment_size_; 67 ptr += shared_memory_segment_size_;
42 } 68 }
43 } 69 }
44 70
45 AudioInputSyncWriter::~AudioInputSyncWriter() {} 71 AudioInputSyncWriter::~AudioInputSyncWriter() {}
46 72
47 // TODO(henrika): Combine into one method (including Write).
48 void AudioInputSyncWriter::UpdateRecordedBytes(uint32 bytes) {
49 socket_->Send(&bytes, sizeof(bytes));
50 }
51
52 void AudioInputSyncWriter::Write(const media::AudioBus* data, 73 void AudioInputSyncWriter::Write(const media::AudioBus* data,
53 double volume, 74 double volume,
54 bool key_pressed) { 75 bool key_pressed,
76 uint32 bytes) {
tommi (sloooow) - chröme 2014/08/29 09:16:42 is there a way to verify that |bytes| is a valid (
no longer working on chromium 2014/08/29 11:14:16 I was confused by the comment of UpdateRecordedByt
55 #if !defined(OS_ANDROID) 77 #if !defined(OS_ANDROID)
56 static const base::TimeDelta kLogDelayThreadhold = 78 static const base::TimeDelta kLogDelayThreadhold =
57 base::TimeDelta::FromMilliseconds(500); 79 base::TimeDelta::FromMilliseconds(500);
58 80
59 std::ostringstream oss; 81 std::ostringstream oss;
60 if (last_write_time_.is_null()) { 82 if (last_write_time_.is_null()) {
61 // This is the first time Write is called. 83 // This is the first time Write is called.
62 base::TimeDelta interval = base::Time::Now() - creation_time_; 84 base::TimeDelta interval = base::Time::Now() - creation_time_;
63 oss << "Audio input data received for the first time: delay = " 85 oss << "Audio input data received for the first time: delay = "
64 << interval.InMilliseconds() << "ms."; 86 << interval.InMilliseconds() << "ms.";
65 87
66 } else { 88 } else {
67 base::TimeDelta interval = base::Time::Now() - last_write_time_; 89 base::TimeDelta interval = base::Time::Now() - last_write_time_;
68 if (interval > kLogDelayThreadhold) { 90 if (interval > kLogDelayThreadhold) {
69 oss << "Audio input data delay unexpectedly long: delay = " 91 oss << "Audio input data delay unexpectedly long: delay = "
70 << interval.InMilliseconds() << "ms."; 92 << interval.InMilliseconds() << "ms.";
71 } 93 }
72 } 94 }
73 if (!oss.str().empty()) 95 if (!oss.str().empty())
74 MediaStreamManager::SendMessageToNativeLog(oss.str()); 96 MediaStreamManager::SendMessageToNativeLog(oss.str());
75 97
76 last_write_time_ = base::Time::Now(); 98 last_write_time_ = base::Time::Now();
77 #endif 99 #endif
78 100
79 // Write audio parameters to shared memory. 101 // Write audio parameters to shared memory.
80 uint8* ptr = static_cast<uint8*>(shared_memory_->memory()); 102 uint8* ptr = static_cast<uint8*>(shared_memory_->memory());
81 ptr += current_segment_id_ * shared_memory_segment_size_; 103 ptr += current_segment_id_ * shared_memory_segment_size_;
82 media::AudioInputBuffer* buffer = 104 media::AudioInputBuffer* buffer =
83 reinterpret_cast<media::AudioInputBuffer*>(ptr); 105 reinterpret_cast<media::AudioInputBuffer*>(ptr);
106
107 // The renderer should set the size to 0 after consuming the buffer. In case
108 // it is not 0, it means buffer has not been consumed yet.
109 if (buffer->params.size)
110 LogAllBuffersAreFull(shared_memory_segment_size_);
111
84 buffer->params.volume = volume; 112 buffer->params.volume = volume;
85 buffer->params.size = audio_bus_memory_size_; 113 buffer->params.size = audio_bus_memory_size_;
86 buffer->params.key_pressed = key_pressed; 114 buffer->params.key_pressed = key_pressed;
87 115
88 // Copy data from the native audio layer into shared memory using pre- 116 // Copy data from the native audio layer into shared memory using pre-
89 // allocated audio buses. 117 // allocated audio buses.
90 media::AudioBus* audio_bus = audio_buses_[current_segment_id_]; 118 media::AudioBus* audio_bus = audio_buses_[current_segment_id_];
91 data->CopyTo(audio_bus); 119 data->CopyTo(audio_bus);
92 120
93 if (++current_segment_id_ >= shared_memory_segment_count_) 121 if (++current_segment_id_ >= shared_memory_segment_count_)
94 current_segment_id_ = 0; 122 current_segment_id_ = 0;
123
124 // Notify the synchronous peer about the number of bytes in the
125 // soundcard which has been recorded.
126 socket_->Send(&bytes, sizeof(bytes));
tommi (sloooow) - chröme 2014/08/29 09:16:42 can the number of bytes not be derived from the Au
no longer working on chromium 2014/08/29 11:14:16 variable name has been changed.
95 } 127 }
96 128
97 void AudioInputSyncWriter::Close() { 129 void AudioInputSyncWriter::Close() {
98 socket_->Close(); 130 socket_->Close();
99 } 131 }
100 132
101 bool AudioInputSyncWriter::Init() { 133 bool AudioInputSyncWriter::Init() {
102 socket_.reset(new base::CancelableSyncSocket()); 134 socket_.reset(new base::CancelableSyncSocket());
103 foreign_socket_.reset(new base::CancelableSyncSocket()); 135 foreign_socket_.reset(new base::CancelableSyncSocket());
104 return base::CancelableSyncSocket::CreatePair(socket_.get(), 136 return base::CancelableSyncSocket::CreatePair(socket_.get(),
(...skipping 17 matching lines...) Expand all
122 base::ProcessHandle process_handle, 154 base::ProcessHandle process_handle,
123 base::FileDescriptor* foreign_handle) { 155 base::FileDescriptor* foreign_handle) {
124 foreign_handle->fd = foreign_socket_->handle(); 156 foreign_handle->fd = foreign_socket_->handle();
125 foreign_handle->auto_close = false; 157 foreign_handle->auto_close = false;
126 return (foreign_handle->fd != -1); 158 return (foreign_handle->fd != -1);
127 } 159 }
128 160
129 #endif 161 #endif
130 162
131 } // namespace content 163 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698