Merge pull request #656 from philippe44/8.2.1-misc

Correct start time for streams with range offset
LMS-Community · Sep 3, 2021 · 4a4de82 · 4a4de82
2 parents e8392d8 + 4e9ae3a
commit 4a4de82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Slim/Player/Protocols/HTTP.pm b/Slim/Player/Protocols/HTTP.pm
@@ -762,6 +762,9 @@ sub parseDirectHeaders {
 		{
 			$startOffset = $seekdata->{sourceStreamOffset};
 		}
+		else {
+			$startOffset -= $song->currentTrack->audio_offset;
+		}
 
 		my $streamLength = $length;
 		$streamLength -= $startOffset if $startOffset;

diff --git a/Slim/Utils/Scanner/Remote.pm b/Slim/Utils/Scanner/Remote.pm
@@ -888,8 +888,14 @@ sub parseMp4Header {
 		return 0;
 	}
 
+	# some mp4 file have wrong mdat length
+	if ($info->{audio_offset} + $info->{audio_size} > $http->response->content_length) { 
+		$log->warn("inconsistent audio offset/size $info->{audio_offset}+$info->{audio_size}and content_length ", $http->response->content_length);
+		$track->audio_size($http->response->content_length - $info->{audio_offset});
+	} else {
+		$track->audio_size($info->{audio_size});		
+	} 	
 	$track->audio_offset($info->{audio_offset});
-	$track->audio_size($info->{audio_size});
 	$track->samplerate($samplerate);
 	$track->samplesize($samplesize);
 	$track->channels($channels);