summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2006-02-07 19:17:51 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2006-02-07 19:17:51 +0000
commit4408b6b70c29ae119a468fc5cf9d83a125d6e368 (patch)
tree2a512ebc6c9f65fc0e0c52d3fe5b98e740eae9a0
parent69519a97f2340fdc81911165f9a95d9f4c436243 (diff)
downloadrockbox-4408b6b70c29ae119a468fc5cf9d83a125d6e368.tar.gz
rockbox-4408b6b70c29ae119a468fc5cf9d83a125d6e368.tar.bz2
rockbox-4408b6b70c29ae119a468fc5cf9d83a125d6e368.zip
Reduce latency when configuring the EQ.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8609 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c34
-rw-r--r--apps/pcmbuf.h1
-rw-r--r--apps/sound_menu.c9
3 files changed, 35 insertions, 9 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index f184672bd1..22e725507b 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -36,11 +36,12 @@
#include "audio.h"
#include "dsp.h"
-#define CHUNK_SIZE PCMBUF_GUARD
+#define CHUNK_SIZE 32768
/* Must be a power of 2 */
#define NUM_PCM_BUFFERS 128
#define NUM_PCM_BUFFERS_MASK (NUM_PCM_BUFFERS - 1)
-#define PCMBUF_WATERMARK (CHUNK_SIZE * 6)
+/* Watermark level at 1s. */
+#define PCMBUF_WATERMARK (NATIVE_FREQUENCY * 4 * 1)
/* Audio buffer related settings. */
static long pcmbuf_size = 0; /* Size of the PCM buffer. */
@@ -83,7 +84,7 @@ struct pcmbufdesc
int size;
/* Call this when the buffer has been played */
void (*callback)(void);
-} pcmbuffers[NUM_PCM_BUFFERS] IDATA_ATTR;
+} pcmbuffers[NUM_PCM_BUFFERS] IDATA_ATTR; /* Do we really need IRAM for this? */
static int pcmbuf_read_index;
static int pcmbuf_write_index;
@@ -95,6 +96,7 @@ static int pcmbuf_num_used_buffers(void);
static void (*position_callback)(int size);
static int last_chunksize;
static long mixpos = 0;
+static bool low_latency_mode = false;
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
static bool boost_mode;
@@ -222,12 +224,17 @@ unsigned int pcmbuf_get_latency(void)
return latency<0?0:latency;
}
+void pcmbuf_set_low_latency(bool state)
+{
+ low_latency_mode = state;
+}
+
bool pcmbuf_is_lowdata(void)
{
if (!pcm_is_playing() || pcm_is_paused() || crossfade_init || crossfade_active)
return false;
- if (pcmbuf_unplayed_bytes < CHUNK_SIZE * 4)
+ if (pcmbuf_unplayed_bytes < pcmbuf_watermark - CHUNK_SIZE)
return true;
return false;
@@ -237,7 +244,7 @@ bool pcmbuf_crossfade_init(bool manual_skip)
{
if (pcmbuf_size - audiobuffer_free < CHUNK_SIZE * 8
|| !pcmbuf_is_crossfade_enabled()
- || crossfade_active || crossfade_init) {
+ || crossfade_active || crossfade_init || low_latency_mode) {
pcmbuf_flush_audio();
return false;
}
@@ -422,7 +429,7 @@ static void crossfade_start(void)
int fade_in_delay = 0;
crossfade_init = 0;
- if (bytesleft < CHUNK_SIZE * 4) {
+ if (bytesleft < NATIVE_FREQUENCY * 4 / 2) {
logf("crossfade rejected");
pcmbuf_play_stop();
return ;
@@ -439,7 +446,7 @@ static void crossfade_start(void)
case CFM_MIX:
case CFM_CROSSFADE:
/* Initialize the crossfade buffer size. */
- crossfade_rem = (bytesleft - (CHUNK_SIZE * 2))/2;
+ crossfade_rem = (bytesleft - (NATIVE_FREQUENCY / 4))/2;
/* Get fade out delay from settings. */
fade_out_delay = NATIVE_FREQUENCY
@@ -593,6 +600,14 @@ static bool prepare_insert(long length)
{
if (crossfade_init)
crossfade_start();
+
+ if (low_latency_mode)
+ {
+ /* 1/4s latency. */
+ if (pcmbuf_unplayed_bytes > NATIVE_FREQUENCY * 4 / 4
+ && pcm_is_playing())
+ return false;
+ }
if (audiobuffer_free < length + audiobuffer_fillpos
+ CHUNK_SIZE && !crossfade_active) {
@@ -603,7 +618,8 @@ static bool prepare_insert(long length)
if (!pcm_is_playing()) {
pcmbuf_boost(true);
crossfade_active = false;
- if (audiobuffer_free < pcmbuf_size - CHUNK_SIZE*4) {
+ /* Pre-buffer 1s. */
+ if (audiobuffer_free < pcmbuf_size - NATIVE_FREQUENCY*4) {
logf("pcm starting");
pcmbuf_play_start();
}
@@ -840,7 +856,7 @@ void pcmbuf_crossfade_enable(bool on_off)
crossfade_enabled = on_off;
if (crossfade_enabled) {
- pcmbuf_set_watermark_bytes(pcmbuf_size - (CHUNK_SIZE*6));
+ pcmbuf_set_watermark_bytes(pcmbuf_size - (NATIVE_FREQUENCY*4/2));
} else {
pcmbuf_set_watermark_bytes(PCMBUF_WATERMARK);
}
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h
index afc62021aa..2476857f88 100644
--- a/apps/pcmbuf.h
+++ b/apps/pcmbuf.h
@@ -45,6 +45,7 @@ bool pcmbuf_crossfade_init(bool manual_skip);
void pcmbuf_add_event(void (*event_handler)(void));
void pcmbuf_set_position_callback(void (*callback)(int size));
unsigned int pcmbuf_get_latency(void);
+void pcmbuf_set_low_latency(bool state);
bool pcmbuf_insert_buffer(char *buf, long length);
void pcmbuf_flush_buffer(long length);
void* pcmbuf_request_buffer(long length, long *realsize);
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index 2bd0ff6e59..9c8d398029 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -46,6 +46,7 @@
#if CONFIG_CODEC == SWCODEC
#include "dsp.h"
#include "eq_menu.h"
+#include "pcmbuf.h"
#endif
int selected_setting; /* Used by the callback */
@@ -394,11 +395,19 @@ bool sound_menu(void)
#endif
};
+#if CONFIG_CODEC == SWCODEC
+ pcmbuf_set_low_latency(true);
+#endif
+
m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
NULL, NULL, NULL);
result = menu_run(m);
menu_exit(m);
+#if CONFIG_CODEC == SWCODEC
+ pcmbuf_set_low_latency(false);
+#endif
+
return result;
}