Skip to content

Disable cross-fading between tracks with different sample rates #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Disable cross-fading between tracks with different sample rates #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 88 additions & 7 deletions Slim/Player/ReplayGain.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ sub fetchGainMode {
return preventClipping( $track->replay_gain(), $track->replay_peak() );
}

# Based on code from James Sutula's Dynamic Transition Updater plugin,
# this method determines whether tracks at a given offset from each
# other in the playlist are similarly adjacent within the same album.
sub trackAlbumMatch {
sub findTracksByIndex {
my $class = shift;
my $client = shift;
my $offset = shift;
Expand Down Expand Up @@ -109,10 +106,24 @@ sub trackAlbumMatch {
# Get the track objects
my $current_url = Slim::Player::Playlist::song($client, $current_index);
my $current_track = Slim::Schema->objectForUrl({ 'url' => $current_url, 'create' => 1, 'readTags' => 1 });

my $compare_url = Slim::Player::Playlist::song($client, $compare_index);
my $compare_track = Slim::Schema->objectForUrl({ 'url' => $compare_url, 'create' => 1, 'readTags' => 1 });

return ($current_track, $compare_track);
}

# Based on code from James Sutula's Dynamic Transition Updater plugin,
# this method determines whether tracks at a given offset from each
# other in the playlist are similarly adjacent within the same album.
sub trackAlbumMatch {
my $class = shift;
my $client = shift;
my $offset = shift;

my ($current_track, $compare_track) = $class->findTracksByIndex($client, $offset);
return if (!$current_track || !$compare_track);

if (!blessed($current_track) || !blessed($compare_track)) {

logError("Couldn't find object for track: [$current_track] or [$compare_track] !");
Expand Down Expand Up @@ -173,18 +184,88 @@ sub trackAlbumMatch {
return 0;
}

# Identify whether the sample rates match between two tracks in a
# client playlist. This is modelled after the trackAlbumMatch function
# above.
sub trackSampleRateMatch {
my $class = shift;
my $client = shift;
my $offset = shift;

my ($current_track, $compare_track) = $class->findTracksByIndex($client, $offset);
return if (!$current_track || !$compare_track);

if (!blessed($current_track) || !blessed($compare_track)) {

logError("Couldn't find object for track: [$current_track] or [$compare_track] !");

return 0;
}

if (!$current_track->can('samplerate') || !$compare_track->can('samplerate')) {

logError("Couldn't a find valid object for track: [$current_track] or [$compare_track] !");

return 0;
}

# For remote tracks, get metadata from the protocol handler
if ( $current_track->remote ) {
if ( !$compare_track->remote ) {
# Other track is not remote, fail
return;
}

my $current_meta = {};
my $compare_meta = {};

my $current_handler = Slim::Player::ProtocolHandlers->handlerForURL( $current_track->url );
my $compare_handler = Slim::Player::ProtocolHandlers->handlerForURL( $compare_track->url );

if ( $current_handler && $current_handler->can('getMetadataFor') ) {
$current_meta = $current_handler->getMetadataFor( $client, $current_track->url );
}

if ( $compare_handler && $compare_handler->can('getMetadataFor') ) {
$compare_meta = $compare_handler->getMetadataFor( $client, $compare_track->url );
}

if ( $current_meta->{samplerate}
&& $compare_meta->{samplerate}
&& $current_meta->{samplerate} eq $compare_meta->{samplerate}
) {
# Sample rate metadata matches
return 1;
}
else {
return;
}
}

# Check sample rates match
my $compare_rate = $compare_track->samplerate;
my $current_rate = $current_track->samplerate;
if ($compare_rate && $current_rate &&
($compare_rate == $current_rate)) {

return 1;
}

return 0;
}

# Bug 5119
# Reduce the gain value if necessary to avoid clipping
sub preventClipping {
my ( $gain, $peak ) = @_;

if ( defined $peak && defined $gain && $peak > 0 ) {
my $noclip = -20 * ( log($peak) / log(10) );
if ( $noclip < $gain ) {
return $noclip;
}
}

return $gain;
}

Expand Down
17 changes: 14 additions & 3 deletions Slim/Player/Squeezebox.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,19 +994,30 @@ sub stream_s {
}
}

# Don't do transitions if the sample rates of the two
# songs differ. This avoids some unpleasant white
# noise from (at least) the Squeezebox Touch when
# using the analogue outputs. This might be bug#1884.
if (!Slim::Player::ReplayGain->trackSampleRateMatch($master, -1)
||
!Slim::Player::ReplayGain->trackSampleRateMatch($master, 1)) {
main::INFOLOG && $log->info('Overriding transition due to differing sample rates');
$transitionType = 0;
}

}

if ($transitionDuration > $client->maxTransitionDuration()) {
$transitionDuration = $client->maxTransitionDuration();
}

if ( main::INFOLOG && $log->is_info ) {
$log->info(sprintf(
"Starting decoder with format: %s flags: 0x%x autostart: %s buffer threshold: %s output threshold: %s samplesize: %s samplerate: %s endian: %s channels: %s",
$formatbyte, $flags, $autostart, $bufferThreshold, $outputThreshold, $pcmsamplesize, $pcmsamplerate, $pcmendian, $pcmchannels,
));
}

my $frame = pack 'aaaaaaaCCCaCCCNnN', (
's', # command
$autostart,
Expand Down