diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-23 21:58:25 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-24 02:00:50 +0000 |
| commit | ec2a34b3217bfb469cac4697d9949b4591370ebc (patch) | |
| tree | 580c6f2f9cabad61eb2edeae730f82f7be040017 | |
| parent | d78a37676efbc24ce1d5c46b65c6caf45ff3bc27 (diff) | |
| download | rockbox-ec2a34b3217bfb469cac4697d9949b4591370ebc.tar.gz rockbox-ec2a34b3217bfb469cac4697d9949b4591370ebc.zip | |
pcm_mixer: Fix an idle frame calculation bug introduced in 2e708c48c5
Resulted in playback sometimes hanging after switching tracks
Change-Id: I3d7a3c131cf547206ec536d9818c5060113f2b11
| -rw-r--r-- | firmware/pcm_mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c index 9467dc4c59..192132b841 100644 --- a/firmware/pcm_mixer.c +++ b/firmware/pcm_mixer.c | |||
| @@ -75,7 +75,7 @@ static struct mixer_channel channels[PCM_MIXER_NUM_CHANNELS] IBSS_ATTR; | |||
| 75 | static struct mixer_channel * active_channels[PCM_MIXER_NUM_CHANNELS+1] IBSS_ATTR; | 75 | static struct mixer_channel * active_channels[PCM_MIXER_NUM_CHANNELS+1] IBSS_ATTR; |
| 76 | 76 | ||
| 77 | /* Number of silence frames to play after all data has played */ | 77 | /* Number of silence frames to play after all data has played */ |
| 78 | #define MAX_IDLE_FRAMES (mixer_sampr*3 / mix_frame_size / 4) | 78 | #define MAX_IDLE_FRAMES (mixer_sampr*3 / (mix_frame_size / 4)) |
| 79 | static unsigned int idle_counter = 0; | 79 | static unsigned int idle_counter = 0; |
| 80 | 80 | ||
| 81 | /** Mixing routines, CPU optmized **/ | 81 | /** Mixing routines, CPU optmized **/ |