From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 10 May 2024 13:24:40 +0000 (+0200)
Subject: Fix the quality score (#1289)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=a7afb85538954699af01a0415e77cc23c7f41b5b;p=music-assistant-server.git

Fix the quality score (#1289)
---

diff --git a/music_assistant/common/models/enums.py b/music_assistant/common/models/enums.py
index 40a07463..ddb6c2b2 100644
--- a/music_assistant/common/models/enums.py
+++ b/music_assistant/common/models/enums.py
@@ -180,6 +180,8 @@ class ContentType(StrEnum):
             ContentType.FLAC,
             ContentType.AIFF,
             ContentType.WAV,
+            ContentType.ALAC,
+            ContentType.WAVPACK,
         )
 
     @classmethod
diff --git a/music_assistant/common/models/media_items.py b/music_assistant/common/models/media_items.py
index cad6df97..62f6d744 100644
--- a/music_assistant/common/models/media_items.py
+++ b/music_assistant/common/models/media_items.py
@@ -10,11 +10,7 @@ from mashumaro import DataClassDictMixin
 
 from music_assistant.common.helpers.global_cache import get_global_cache_value
 from music_assistant.common.helpers.uri import create_uri
-from music_assistant.common.helpers.util import (
-    create_sort_name,
-    is_valid_uuid,
-    merge_lists,
-)
+from music_assistant.common.helpers.util import create_sort_name, is_valid_uuid, merge_lists
 from music_assistant.common.models.enums import (
     AlbumType,
     ContentType,
@@ -79,14 +75,15 @@ class AudioFormat(DataClassDictMixin):
     def quality(self) -> int:
         """Calculate quality score."""
         if self.content_type.is_lossless():
+            # lossless content is scored very high based on sample rate and bit depth
             return int(self.sample_rate / 1000) + self.bit_depth
         # lossy content, bit_rate is most important score
         # but prefer some codecs over others
-        # rule out bitrates > 320 as that is just an error (happens e.g. for AC3 stream somehow)
-        score = min(320, self.bit_rate) / 100
+        # calculate a rough score based on bit rate per channel
+        bit_rate_score = (self.bit_rate / self.channels) / 100
         if self.content_type in (ContentType.AAC, ContentType.OGG):
-            score += 1
-        return int(score)
+            bit_rate_score += 1
+        return int(bit_rate_score)
 
     @property
     def pcm_sample_size(self) -> int: