Index: media/audio/cras/audio_manager_cras.cc |
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc |
index 65a2f66d43d228d2856ca1242c3e62bd46d94889..f39083785eeecfac7fb7d25fdc14d9b90a0e0112 100644 |
--- a/media/audio/cras/audio_manager_cras.cc |
+++ b/media/audio/cras/audio_manager_cras.cc |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
#include <algorithm> |
+#include <map> |
#include "base/command_line.h" |
#include "base/environment.h" |
@@ -16,6 +17,7 @@ |
#include "base/nix/xdg_util.h" |
#include "base/stl_util.h" |
#include "base/strings/string_number_conversions.h" |
+#include "base/sys_info.h" |
#include "chromeos/audio/audio_device.h" |
#include "chromeos/audio/cras_audio_handler.h" |
#include "media/audio/audio_device_description.h" |
@@ -43,6 +45,11 @@ const int kDefaultSampleRate = 48000; |
const int kMinimumOutputBufferSize = 512; |
const int kMaximumOutputBufferSize = 8192; |
+// Boards with customized minimum output buffer size. |
+const std::map<std::string, int> kCustomizedOutputBufferSizeMap = { |
DaleCurtis
2017/03/30 16:17:42
This is a static initializer, you should instead j
cychiang
2017/04/07 08:45:41
Done.
|
+ {"samus", 256}, |
+ {"kevin", 768}}; |
+ |
// Default input buffer size. |
const int kDefaultInputBufferSize = 1024; |
@@ -265,12 +272,21 @@ AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream( |
return MakeInputStream(params, device_id); |
} |
+int AudioManagerCras::GetMinimumOutputBufferSizePerBoard() { |
+ std::string board = base::SysInfo::GetLsbReleaseBoard(); |
+ if (kCustomizedOutputBufferSizeMap.find(board) != |
+ kCustomizedOutputBufferSizeMap.end()) { |
+ return kCustomizedOutputBufferSizeMap.at(board); |
+ } |
+ return kMinimumOutputBufferSize; |
+} |
+ |
AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters( |
const std::string& output_device_id, |
const AudioParameters& input_params) { |
ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; |
int sample_rate = kDefaultSampleRate; |
- int buffer_size = kMinimumOutputBufferSize; |
+ int buffer_size = GetMinimumOutputBufferSizePerBoard(); |
int bits_per_sample = 16; |
if (input_params.IsValid()) { |
sample_rate = input_params.sample_rate(); |