[ChooserTest] Add switch segment test for audio

CastagnaIT · CastagnaIT · commit 891c4462825c · 2026-02-25T19:50:51.000+01:00
diff --git a/inputstream.adaptive/resources/language/resource.language.en_gb/strings.po b/inputstream.adaptive/resources/language/resource.language.en_gb/strings.po
@@ -308,9 +308,9 @@ msgctxt "#30234"
 msgid "Switch by segments"
 msgstr ""
 
-#. Stand for stream segments, referred to setting with label #30234
+#. Stand for video stream segments, referred to setting with label #30234
 msgctxt "#30235"
-msgid "Segments"
+msgid "Video segments (set 0 to disable)"
 msgstr ""
 
 #. Category group title
@@ -398,3 +398,8 @@ msgstr ""
 msgctxt "#30309"
 msgid "No audio/video stream can be played."
 msgstr ""
+
+#. Stand for audio stream segments, referred to setting with label #30234
+msgctxt "#30350"
+msgid "Audio segments (set 0 to disable)"
+msgstr ""
diff --git a/inputstream.adaptive/resources/settings.xml.in b/inputstream.adaptive/resources/settings.xml.in
@@ -164,11 +164,11 @@
             <heading>30233</heading>
           </control>
         </setting>
-        <setting parent="adaptivestream.test.mode" id="adaptivestream.test.segments" type="integer" label="30235">
+        <setting parent="adaptivestream.test.mode" id="adaptivestream.test.segments.video" type="integer" label="30235">
           <level>0</level>
           <default>2</default>
           <constraints>
-            <minimum>1</minimum>
+            <minimum>0</minimum>
             <step>1</step>
             <maximum>2000</maximum>
           </constraints>
@@ -184,6 +184,26 @@
             <heading>30235</heading>
           </control>
         </setting>
+        <setting parent="adaptivestream.test.mode" id="adaptivestream.test.segments.audio" type="integer" label="30350">
+          <level>0</level>
+          <default>0</default>
+          <constraints>
+            <minimum>0</minimum>
+            <step>1</step>
+            <maximum>2000</maximum>
+          </constraints>
+          <dependencies>
+            <dependency type="visible">
+              <and>
+                <condition setting="adaptivestream.type">test</condition>
+                <condition setting="adaptivestream.test.mode">switch-segments</condition>
+              </and>
+            </dependency>
+          </dependencies>
+          <control type="edit" format="integer">
+            <heading>30350</heading>
+          </control>
+        </setting>
       </group>
     </category>
     <category id="expert" label="30120">
diff --git a/src/CompSettings.cpp b/src/CompSettings.cpp
@@ -112,9 +112,14 @@ std::string ADP::SETTINGS::CCompSettings::GetChooserTestMode() const
   return kodi::addon::GetSettingString("adaptivestream.test.mode");
 }
 
-int ADP::SETTINGS::CCompSettings::GetChooserTestSegs() const
+int ADP::SETTINGS::CCompSettings::GetChooserTestSegsVideo() const
 {
-  return kodi::addon::GetSettingInt("adaptivestream.test.segments");
+  return kodi::addon::GetSettingInt("adaptivestream.test.segments.video");
+}
+
+int ADP::SETTINGS::CCompSettings::GetChooserTestSegsAudio() const
+{
+  return kodi::addon::GetSettingInt("adaptivestream.test.segments.audio");
 }
 
 int ADP::SETTINGS::CCompSettings::GetMediaType() const
diff --git a/src/CompSettings.h b/src/CompSettings.h
@@ -63,7 +63,8 @@ class ATTR_DLL_LOCAL CCompSettings
   bool IsIgnoreScreenResChange() const;
 
   std::string GetChooserTestMode() const;
-  int GetChooserTestSegs() const;
+  int GetChooserTestSegsVideo() const;
+  int GetChooserTestSegsAudio() const;
 
   // Expert settings
 
diff --git a/src/common/ChooserTest.cpp b/src/common/ChooserTest.cpp
@@ -47,8 +47,11 @@ void CRepresentationChooserTest::Initialize(const ADP::KODI_PROPS::ChooserProps&
 
   if (m_testMode == TestMode::SWITCH_SEGMENTS)
   {
-    m_segmentsLimit = settings.GetChooserTestSegs();
-    logDetails = kodi::tools::StringUtils::Format("Segments: %i", m_segmentsLimit);
+    m_segmentsCountByType[StreamType::VIDEO] = settings.GetChooserTestSegsVideo();
+    m_segmentsCountByType[StreamType::AUDIO] = settings.GetChooserTestSegsAudio();
+    logDetails = kodi::tools::StringUtils::Format(
+        "Segments count video: %i, Segments count audio: %i",
+        m_segmentsCountByType[StreamType::VIDEO], m_segmentsCountByType[StreamType::AUDIO]);
   }
 
   LOG::Log(LOGDEBUG,
@@ -66,10 +69,12 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(
 {
   CRepresentationSelector selector(m_screenCurrentWidth, m_screenCurrentHeight);
   CRepresentation* nextRep{currentRep};
+  const StreamType streamType{adp->GetStreamType()};
+  const int maxSegCount{m_segmentsCountByType[streamType]};
 
   if (!currentRep) // Startup or new period
   {
-    m_segmentsElapsed = 1;
+    m_segmentsElapsedByType[streamType] = 1;
 
     if (m_testMode == TestMode::SWITCH_SEGMENTS)
     {
@@ -84,13 +89,14 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(
   {
     if (m_testMode == TestMode::SWITCH_SEGMENTS)
     {
-      if (adp->GetStreamType() != StreamType::VIDEO)
+      if (maxSegCount == 0 || (streamType != StreamType::VIDEO && streamType != StreamType::AUDIO))
         return currentRep;
 
-      m_segmentsElapsed += 1;
-      if (m_segmentsElapsed > m_segmentsLimit)
+      ++m_segmentsElapsedByType[streamType];
+
+      if (m_segmentsElapsedByType[streamType] > maxSegCount)
       {
-        m_segmentsElapsed = 1;
+        m_segmentsElapsedByType[streamType] = 1;
         nextRep = selector.Higher(adp, currentRep);
         // If there are no next representations, start again from the lowest
         if (nextRep == currentRep)
@@ -99,7 +105,7 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(
     }
   }
 
-  if (adp->GetStreamType() == StreamType::VIDEO && currentRep)
+  if (currentRep && maxSegCount != 0)
     LogDetails(currentRep, nextRep);
 
   return nextRep;
diff --git a/src/common/ChooserTest.h b/src/common/ChooserTest.h
@@ -8,8 +8,11 @@
 
 #pragma once
 
+#include "AdaptiveUtils.h"
 #include "Chooser.h"
 
+#include <unordered_map>
+
 namespace CHOOSER
 {
   /*!
@@ -39,8 +42,9 @@ namespace CHOOSER
 
     TestMode m_testMode{TestMode::NONE};
     StreamSelection m_streamSelectionMode = StreamSelection::AUTO;
-    int m_segmentsElapsed{1};
-    int m_segmentsLimit{1};
+
+    std::unordered_map<PLAYLIST::StreamType, int> m_segmentsCountByType;
+    std::unordered_map<PLAYLIST::StreamType, int> m_segmentsElapsedByType;
   };
 
 } // namespace CHOOSER

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,14 @@ std::string ADP::SETTINGS::CCompSettings::GetChooserTestMode() const`
`112`	`112`	`return kodi::addon::GetSettingString("adaptivestream.test.mode");`
`113`	`113`	`}`
`114`	`114`
`115`		`-int ADP::SETTINGS::CCompSettings::GetChooserTestSegs() const`
	`115`	`+int ADP::SETTINGS::CCompSettings::GetChooserTestSegsVideo() const`
`116`	`116`	`{`
`117`		`- return kodi::addon::GetSettingInt("adaptivestream.test.segments");`
	`117`	`+ return kodi::addon::GetSettingInt("adaptivestream.test.segments.video");`
	`118`	`+}`
	`119`	`+`
	`120`	`+int ADP::SETTINGS::CCompSettings::GetChooserTestSegsAudio() const`
	`121`	`+{`
	`122`	`+ return kodi::addon::GetSettingInt("adaptivestream.test.segments.audio");`
`118`	`123`	`}`
`119`	`124`
`120`	`125`	`int ADP::SETTINGS::CCompSettings::GetMediaType() const`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,11 @@ void CRepresentationChooserTest::Initialize(const ADP::KODI_PROPS::ChooserProps&`
`47`	`47`
`48`	`48`	`if (m_testMode == TestMode::SWITCH_SEGMENTS)`
`49`	`49`	`{`
`50`		`- m_segmentsLimit = settings.GetChooserTestSegs();`
`51`		`- logDetails = kodi::tools::StringUtils::Format("Segments: %i", m_segmentsLimit);`
	`50`	`+ m_segmentsCountByType[StreamType::VIDEO] = settings.GetChooserTestSegsVideo();`
	`51`	`+ m_segmentsCountByType[StreamType::AUDIO] = settings.GetChooserTestSegsAudio();`
	`52`	`+ logDetails = kodi::tools::StringUtils::Format(`
	`53`	`+ "Segments count video: %i, Segments count audio: %i",`
	`54`	`+ m_segmentsCountByType[StreamType::VIDEO], m_segmentsCountByType[StreamType::AUDIO]);`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`LOG::Log(LOGDEBUG,`
`@@ -66,10 +69,12 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(`
`66`	`69`	`{`
`67`	`70`	`CRepresentationSelector selector(m_screenCurrentWidth, m_screenCurrentHeight);`
`68`	`71`	`CRepresentation* nextRep{currentRep};`
	`72`	`+ const StreamType streamType{adp->GetStreamType()};`
	`73`	`+ const int maxSegCount{m_segmentsCountByType[streamType]};`
`69`	`74`
`70`	`75`	`if (!currentRep) // Startup or new period`
`71`	`76`	`{`
`72`		`- m_segmentsElapsed = 1;`
	`77`	`+ m_segmentsElapsedByType[streamType] = 1;`
`73`	`78`
`74`	`79`	`if (m_testMode == TestMode::SWITCH_SEGMENTS)`
`75`	`80`	`{`
`@@ -84,13 +89,14 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(`
`84`	`89`	`{`
`85`	`90`	`if (m_testMode == TestMode::SWITCH_SEGMENTS)`
`86`	`91`	`{`
`87`		`- if (adp->GetStreamType() != StreamType::VIDEO)`
	`92`	`+ if (maxSegCount == 0 \|\| (streamType != StreamType::VIDEO && streamType != StreamType::AUDIO))`
`88`	`93`	`return currentRep;`
`89`	`94`
`90`		`- m_segmentsElapsed += 1;`
`91`		`- if (m_segmentsElapsed > m_segmentsLimit)`
	`95`	`+ ++m_segmentsElapsedByType[streamType];`
	`96`	`+`
	`97`	`+ if (m_segmentsElapsedByType[streamType] > maxSegCount)`
`92`	`98`	`{`
`93`		`- m_segmentsElapsed = 1;`
	`99`	`+ m_segmentsElapsedByType[streamType] = 1;`
`94`	`100`	`nextRep = selector.Higher(adp, currentRep);`
`95`	`101`	`// If there are no next representations, start again from the lowest`
`96`	`102`	`if (nextRep == currentRep)`
`@@ -99,7 +105,7 @@ PLAYLIST::CRepresentation* CRepresentationChooserTest::GetNextRepresentation(`
`99`	`105`	`}`
`100`	`106`	`}`
`101`	`107`
`102`		`- if (adp->GetStreamType() == StreamType::VIDEO && currentRep)`
	`108`	`+ if (currentRep && maxSegCount != 0)`
`103`	`109`	`LogDetails(currentRep, nextRep);`
`104`	`110`
`105`	`111`	`return nextRep;`