From 93e9e870e35ca31c1332c1c76c30f0974db78b58 Mon Sep 17 00:00:00 2001
From: CrystalP <crystalp@kodi.tv>
Date: Sun, 10 Nov 2024 12:04:26 -0500
Subject: [PATCH] [video] Store DVD audio streams codec in codecDesc

Align with ffmpeg demuxer streams, the name field is not meant for codec info.
---
 .../resource.language.en_gb/resources/strings.po   | 17 +++++++++-
 .../DVDInputStreams/DVDInputStreamNavigator.cpp    | 38 ++++++++++++----------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 161c008f4e..144eeca6e8 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -5429,6 +5429,7 @@ msgid "File browser"
 msgstr ""
 
 #. Audio Channel count
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 #: xbmc/video/dialogs/GUIDialogAudioSettings.cpp
 msgctxt "#10127"
 msgid "channels"
@@ -6727,6 +6728,7 @@ msgstr ""
 #: xbmc/GUIInfoManager.cpp
 #: xbmc/LangInfo.cpp
 #: xbmc/addons/gui/GUIDialogAddonSettings.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 #: xbmc/music/MusicDatabase.cpp
 #: xbmc/peripherals/bus/PeripheralBus.cpp
 #: xbmc/peripherals/devices/Peripheral.cpp
@@ -17070,6 +17072,7 @@ msgstr ""
 
 #. Other informations, in list selector (if present)
 #: xbmc/pvr/dialogs/GUIDialogPVRRadioRDSInfo.cpp
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
 msgctxt "#29921"
 msgid "Other"
 msgstr ""
@@ -22347,7 +22350,19 @@ msgctxt "#37002"
 msgid "(Director's comments 2)"
 msgstr ""
 
-#empty strings from id 37003 to 37013
+#. DVD short name for 1.0 channel layout
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+msgctxt "#37003"
+msgid "mono"
+msgstr ""
+
+#. DVD short name for 2.0 channel layout
+#: xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+msgctxt "#37004"
+msgid "stereo"
+msgstr ""
+
+#empty strings from id 37005 to 37013
 
 #: xbmc/GUIInfoManager.cpp
 msgctxt "#37014"
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
index 178ed401dc..a51117b1cc 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -1026,60 +1026,62 @@ void CDVDInputStreamNavigator::SetAudioStreamName(AudioStreamInfo &info, const a
   switch(audio_attributes.audio_format)
   {
   case DVD_AUDIO_FORMAT_AC3:
-    info.name += " AC3";
+    info.codecDesc = "AC3";
     info.codecName = "ac3";
     break;
   case DVD_AUDIO_FORMAT_UNKNOWN_1:
-    info.name += " UNKNOWN #1";
+    info.codecDesc = g_localizeStrings.Get(13205); // "Unknown"
+    CLog::LogF(LOGINFO, "unknown dvd audio codec DVD_AUDIO_FORMAT_UNKNOWN_1");
     break;
   case DVD_AUDIO_FORMAT_MPEG:
-    info.name += " MPEG AUDIO";
+    info.codecDesc = "MPEG-1";
     info.codecName = "mp1";
     break;
   case DVD_AUDIO_FORMAT_MPEG2_EXT:
-    info.name += " MP2 Ext.";
+    info.codecDesc = "MPEG-2";
     info.codecName = "mp2";
     break;
   case DVD_AUDIO_FORMAT_LPCM:
-    info.name += " LPCM";
+    info.codecDesc = "LPCM";
     info.codecName = "pcm";
     break;
   case DVD_AUDIO_FORMAT_UNKNOWN_5:
-    info.name += " UNKNOWN #5";
+    info.codecDesc = g_localizeStrings.Get(13205); // "Unknown"
+    CLog::LogF(LOGINFO, "unknown dvd audio codec DVD_AUDIO_FORMAT_UNKNOWN_5");
     break;
   case DVD_AUDIO_FORMAT_DTS:
-    info.name += " DTS";
+    info.codecDesc = "DTS";
     info.codecName = "dts";
     break;
   case DVD_AUDIO_FORMAT_SDDS:
-    info.name += " SDDS";
+    info.codecDesc = "SDDS";
     break;
   default:
-    info.name += " Other";
+    info.codecDesc = g_localizeStrings.Get(13205); // "Unknown"
+    CLog::LogF(LOGINFO, "unknown dvd audio codec");
     break;
   }
 
+  info.codecDesc.append(" ");
+
   switch(audio_attributes.channels + 1)
   {
   case 1:
-    info.name += " Mono";
+    info.codecDesc += g_localizeStrings.Get(37003); // "mono"
     break;
   case 2:
-    info.name += " Stereo";
+    info.codecDesc += g_localizeStrings.Get(37004); // "stereo"
     break;
   case 6:
-    info.name += " 5.1";
+    info.codecDesc += "5.1";
     break;
   case 7:
-    info.name += " 6.1";
+    info.codecDesc += "6.1";
     break;
   default:
-    char temp[32];
-    snprintf(temp, sizeof(temp), " %d-chs", audio_attributes.channels + 1);
-    info.name += temp;
+    info.codecDesc += StringUtils::Format("{:d} {}", audio_attributes.channels + 1,
+                                          g_localizeStrings.Get(10127)); // "channels"
   }
-
-  StringUtils::TrimLeft(info.name);
 }
 
 AudioStreamInfo CDVDInputStreamNavigator::GetAudioStreamInfo(const int iId)
-- 
2.11.4.GIT