oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: enforce a reasonable minimum audio_buffer_size setting

Browse Source
This commit is contained in:
Max Kellermann 2017-05-15 22:39:57 +02:00
parent f567083006
commit f41a169460
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
ver 0.20.7 (not yet released) ver 0.20.7 (not yet released)
* database * database
- simple: fix false positive directory loop detection with NFS - simple: fix false positive directory loop detection with NFS
* enforce a reasonable minimum audio_buffer_size setting
* fix random crashes when compiled with clang * fix random crashes when compiled with clang
ver 0.20.6 (2017/03/10) ver 0.20.6 (2017/03/10)

10
src/Main.cxx
View File

@ -121,6 +121,9 @@ static constexpr size_t KILOBYTE = 1024;
static constexpr size_t MEGABYTE = 1024 * KILOBYTE; static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE; static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
static constexpr size_t MIN_BUFFER_SIZE = std::max(CHUNK_SIZE * 32,
64 * KILOBYTE);
static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10; static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;
#ifdef ANDROID #ifdef ANDROID
@ -310,6 +313,13 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
"positive integer, line %i", "positive integer, line %i",
param->value.c_str(), param->line); param->value.c_str(), param->line);
buffer_size = tmp * KILOBYTE; buffer_size = tmp * KILOBYTE;
if (buffer_size < MIN_BUFFER_SIZE) {
FormatWarning(config_domain, "buffer size %lu is too small, using %lu bytes instead",
(unsigned long)buffer_size,
(unsigned long)MIN_BUFFER_SIZE);
buffer_size = MIN_BUFFER_SIZE;
}
} else } else
buffer_size = DEFAULT_BUFFER_SIZE; buffer_size = DEFAULT_BUFFER_SIZE;