From adf870c1668b9d7de738b4915820459a152fc817 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 4 Nov 2013 10:34:12 +0100 Subject: tmp --- src/AudioCompress/compress.c | 2 ++ src/AudioCompress/config.h | 4 ++-- src/client_global.c | 2 +- src/client_new.c | 2 +- src/input/ffmpeg_input_plugin.c | 1 + src/ls.c | 3 +-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/AudioCompress/compress.c b/src/AudioCompress/compress.c index 36cdfd8d..9346eee6 100644 --- a/src/AudioCompress/compress.c +++ b/src/AudioCompress/compress.c @@ -124,6 +124,7 @@ void Compressor_Process_int16(struct Compressor *obj, int16_t *audio, //! Determine target gain newGain = (1 << 10)*prefs->target/peakVal; + fprintf(stderr, "peak %d gain %d\n", peakVal, newGain); //! Adjust the gain with inertia from the previous gain value newGain = (curGain*((1 << prefs->smooth) - 1) + newGain) @@ -156,6 +157,7 @@ void Compressor_Process_int16(struct Compressor *obj, int16_t *audio, ap = audio; *clipped = 0; + fprintf(stderr, "count %u curgain %d newgain %d\n", count, curGain, newGain); for (i = 0; i < count; i++) { int sample; diff --git a/src/AudioCompress/config.h b/src/AudioCompress/config.h index 25615ee6..a4b89e7d 100644 --- a/src/AudioCompress/config.h +++ b/src/AudioCompress/config.h @@ -9,11 +9,11 @@ #define ACVERSION "2.0" /*** Default configuration stuff ***/ -#define TARGET 16384 /*!< Target level (on a scale of 0-32767) */ +#define TARGET 20000 /*!< Target level (on a scale of 0-32767) */ #define GAINMAX 32 /*!< The maximum amount to amplify by */ #define GAINSMOOTH 8 /*!< How much inertia ramping has*/ -#define BUCKETS 400 /*!< How long of a history to use by default */ +#define BUCKETS 40 /*!< How long of a history to use by default */ #endif diff --git a/src/client_global.c b/src/client_global.c index adf3b2f9..c89f3208 100644 --- a/src/client_global.c +++ b/src/client_global.c @@ -26,7 +26,7 @@ #define CLIENT_TIMEOUT_DEFAULT (60) #define CLIENT_MAX_CONNECTIONS_DEFAULT (10) #define CLIENT_MAX_COMMAND_LIST_DEFAULT (2048*1024) -#define CLIENT_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (8192*1024) +#define CLIENT_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (8192*1024*8) /* set this to zero to indicate we have no possible clients */ unsigned int client_max_connections; diff --git a/src/client_new.c b/src/client_new.c index 4dba4d88..d32e9f5e 100644 --- a/src/client_new.c +++ b/src/client_new.c @@ -102,7 +102,7 @@ client_new(struct player_control *player_control, G_IO_IN|G_IO_ERR|G_IO_HUP, client_in_event, client); - client->input = fifo_buffer_new(4096); + client->input = fifo_buffer_new(16*4096); client->permission = getDefaultPermissions(); client->uid = uid; diff --git a/src/input/ffmpeg_input_plugin.c b/src/input/ffmpeg_input_plugin.c index d71b3d4c..b74ed79a 100644 --- a/src/input/ffmpeg_input_plugin.c +++ b/src/input/ffmpeg_input_plugin.c @@ -85,6 +85,7 @@ input_ffmpeg_open(const char *uri, struct input_ffmpeg *i; if (!g_str_has_prefix(uri, "gopher://") && + !g_str_has_prefix(uri, "http://") && !g_str_has_prefix(uri, "rtp://") && !g_str_has_prefix(uri, "rtsp://") && !g_str_has_prefix(uri, "rtmp://") && diff --git a/src/ls.c b/src/ls.c index 1c72a2a7..34521004 100644 --- a/src/ls.c +++ b/src/ls.c @@ -35,14 +35,13 @@ static const char *remoteUrlPrefixes[] = { #if defined(ENABLE_CURL) || defined(ENABLE_SOUP) "http://", #endif -#ifdef HAVE_FFMPEG "gopher://", + "http://", "rtp://", "rtsp://", "rtmp://", "rtmpt://", "rtmps://", -#endif #ifdef ENABLE_CDIO_PARANOIA "cdda://", #endif -- cgit v1.2.3