diff --git a/README.md b/README.md index 5e45fe8..185fdce 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ The script allows a user to test a specific configuration and it can be used to Usage run_test.sh sample_format sample_rate channels duration sample_format can be one of S16_LE, S24_3LE, S32_LE - sample_rate can be one of 44100, 48000, 96000, 192000, 384000 + sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000 channels can be one of 2, 4, 6, up to 64 duration is in the range 1 to 10 minutes @@ -310,7 +310,7 @@ The script allows a user to test the latency on a specific configuration and it Usage run_latency_test.sh sample_format sample_rate channels duration frames sample_format can be one of S16_LE, S24_3LE, S32_LE - sample_rate can be one of 44100, 48000, 96000, 192000, 384000 + sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000 channels can be one of 2, 4, 6, up to 64 duration of the test in seconds frames buffer size in frames diff --git a/build.sh b/build.sh index ed77e53..cbd4ead 100755 --- a/build.sh +++ b/build.sh @@ -48,6 +48,6 @@ cmake \ -DFAKE_DRIVER=OFF \ -DWITH_SYSTEMD=ON \ . -make -j +make cd .. diff --git a/daemon/README.md b/daemon/README.md index fda9fb0..9eec22a 100644 --- a/daemon/README.md +++ b/daemon/README.md @@ -260,7 +260,7 @@ where: > **sample\_rate** > JSON number specifying the default sample rate. -> Valid values are 44100Hz, 48000Hz, 96000Hz, 192000Hz and 384000Hz. +> Valid values are 44100Hz, 48000Hz, 88200Hz, 96000Hz, 192000Hz and 384000Hz. > **playout\_delay** > JSON number specifying the default safety playout delay at 1FS in samples. diff --git a/daemon/main.cpp b/daemon/main.cpp index cc77e42..e307fd0 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -40,7 +40,7 @@ namespace po = boost::program_options; namespace postyle = boost::program_options::command_line_style; namespace logging = boost::log; -static const std::string version("bondagit-2.0.0"); +static const std::string version("bondagit-2.0.1"); static std::atomic terminate = false; void termination_handler(int signum) { diff --git a/run_latency_test.sh b/run_latency_test.sh index 34f5d15..89339c8 100755 --- a/run_latency_test.sh +++ b/run_latency_test.sh @@ -15,7 +15,7 @@ function cleanup { function usage { echo 'Usage run_latency_test.sh sample_format sample_rate channels duration frames' >&2 echo ' sample_format can be one of S16_LE, S24_3LE, S32_LE' >&2 - echo ' sample_rate can be one of 44100, 48000, 96000, 192000, 384000' >&2 + echo ' sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000' >&2 echo ' channels can be one of 2, 4, 6, up to 64' >&2 echo ' duration in seconds' >&2 echo ' frames buffer size in frames' >&2 @@ -83,6 +83,8 @@ if [ $SAMPLE_RATE == "44100" ]; then PTIME="1.08843537415" elif [ $SAMPLE_RATE == "48000" ]; then PTIME="1" +elif [ $SAMPLE_RATE == "88200" ]; then + PTIME="0.54421768707" elif [ $SAMPLE_RATE == "96000" ]; then PTIME="0.5" elif [ $SAMPLE_RATE == "192000" ]; then diff --git a/run_test.sh b/run_test.sh index bcdac37..84bf4d3 100755 --- a/run_test.sh +++ b/run_test.sh @@ -45,7 +45,7 @@ echo 'Creating test file ...' >&2 if ! ./createtest $1 $2 $3 $4 ; then echo 'Usage run_test.sh sample_format sample_rate channels duration' >&2 echo ' sample_format can be one of S16_LE, S24_3LE, S32_LE' >&2 - echo ' sample_rate can be one of 44100, 48000, 96000, 192000, 384000' >&2 + echo ' sample_rate can be one of 44100, 48000, 88200, 96000, 192000, 384000' >&2 echo ' channels can be one of 2, 4, 6, up to 64' >&2 echo ' duration is in the range 1 to 10 minutes' >&2 exit 1 @@ -72,6 +72,8 @@ if [ $SAMPLE_RATE == "44100" ]; then PTIME="1.08843537415" elif [ $SAMPLE_RATE == "48000" ]; then PTIME="1" +elif [ $SAMPLE_RATE == "88200" ]; then + PTIME="0.54421768707" elif [ $SAMPLE_RATE == "96000" ]; then PTIME="0.5" elif [ $SAMPLE_RATE == "192000" ]; then diff --git a/test/createtest.cc b/test/createtest.cc index 1011103..44281c3 100644 --- a/test/createtest.cc +++ b/test/createtest.cc @@ -25,7 +25,7 @@ int main(int argc, char* argv[]) } int rate(atoi(argv[2])); - if (rate != 44100 && rate != 48000 && rate != 96000 && rate != 192000 && rate != 384000) { + if (rate != 44100 && rate != 48000 && rate != 88200 && rate != 96000 && rate != 192000 && rate != 384000) { cerr << "Unsupported rate " << rate << endl; exit(1); } diff --git a/test/daemon.conf b/test/daemon.conf index ded6ffb..67a2cd5 100644 --- a/test/daemon.conf +++ b/test/daemon.conf @@ -27,6 +27,6 @@ "streamer_files_num": 8, "streamer_file_duration": 1, "streamer_player_buffer_files_num": 1, - "streamer_enabled": true, + "streamer_enabled": false, "auto_sinks_update": true } diff --git a/webui/src/Config.jsx b/webui/src/Config.jsx index f7fdb4f..bbd441f 100644 --- a/webui/src/Config.jsx +++ b/webui/src/Config.jsx @@ -219,6 +219,7 @@ class Config extends Component {