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

CrossFade: use negative value for invalid MixRamp overlap

Browse Source 
Avoid NaN to allow -ffast-math.
This commit is contained in:
Max Kellermann 2013-10-30 17:06:40 +01:00
parent c0c0526fc8
commit c6f101884b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/CrossFade.cxx
View File

@ -83,7 +83,7 @@ mixramp_interpolate(const char *ramp_list, float required_db)
return secs;
}
return nan("");
return -1;
}
unsigned
@ -96,7 +96,6 @@ CrossFadeSettings::Calculate(float total_time,
{
unsigned int chunks = 0;
float chunks_f;
float mixramp_overlap;
if (duration < 0 || duration >= total_time ||
/* we can't crossfade when the audio formats are different */
@ -112,9 +111,17 @@ CrossFadeSettings::Calculate(float total_time,
chunks = (chunks_f * duration + 0.5);
} else {
/* Calculate mixramp overlap. */
mixramp_overlap = mixramp_interpolate(mixramp_start, mixramp_db - replay_gain_db)
+ mixramp_interpolate(mixramp_prev_end, mixramp_db - replay_gain_prev_db);
if (!std::isnan(mixramp_overlap) &&
const float mixramp_overlap_current =
mixramp_interpolate(mixramp_start,
mixramp_db - replay_gain_db);
const float mixramp_overlap_prev =
mixramp_interpolate(mixramp_prev_end,
mixramp_db - replay_gain_prev_db);
const float mixramp_overlap =
mixramp_overlap_current + mixramp_overlap_prev;
if (mixramp_overlap_current >= 0 &&
mixramp_overlap_prev >= 0 &&
mixramp_delay <= mixramp_overlap) {
chunks = (chunks_f * (mixramp_overlap - mixramp_delay));
FormatDebug(cross_fade_domain,

2
test/test_mixramp.cxx
View File

@ -43,7 +43,7 @@ public:
free(foo);
foo = strdup(input);
CPPUNIT_ASSERT(std::isnan(mixramp_interpolate(foo, 6.1)));
CPPUNIT_ASSERT(mixramp_interpolate(foo, 6.1) < 0);
free(foo);
foo = strdup(input);