Merge pull request #732 from glennguy/rework-new

Buffering and adaptive bitrate switching
xbmc · Sep 28, 2021 · 26f2145 · 26f2145
2 parents 649891c + d69eb7f
commit 26f2145
Show file tree

Hide file tree

Showing 19 changed files with 1,332 additions and 696 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ find_package(Kodi REQUIRED)
 set(ADP_SOURCES
 	src/main.cpp
 	src/common/AdaptiveTree.cpp
+	src/common/RepresentationChooser.cpp
 	src/parser/DASHTree.cpp
 	src/parser/HLSTree.cpp
 	src/parser/SmoothTree.cpp
@@ -32,6 +33,7 @@ set(ADP_HEADERS
 	src/SSD_dll.h
 	src/common/AdaptiveStream.h
 	src/common/AdaptiveTree.h
+	src/common/RepresentationChooser.h
 	src/parser/DASHTree.h
 	src/parser/HLSTree.h
 	src/parser/SmoothTree.h

diff --git a/inputstream.adaptive/resources/language/resource.language.en_gb/strings.po b/inputstream.adaptive/resources/language/resource.language.en_gb/strings.po
@@ -34,6 +34,21 @@ msgctxt "#30102"
 msgid "Max. Bandwidth (Bit/s)"
 msgstr ""
 
+# Assured buffer length duration (seconds)
+msgctxt "#30200"
+msgid "Assured Buffer Duration (sec)"
+msgstr ""
+
+# Max buffer length duration (seconds)
+msgctxt "#30201"
+msgid "Max Buffer Duration (sec)"
+msgstr ""
+
+# Ignore Window Display Resolution Change
+msgctxt "#30202"
+msgid "Ignore Window Change"
+msgstr ""
+
 # Absolute path to the folder containing the decrypters
 msgctxt "#30103"
 msgid "Decrypter path"

diff --git a/inputstream.adaptive/resources/settings.xml.in b/inputstream.adaptive/resources/settings.xml.in
@@ -13,6 +13,21 @@
           <default>0</default>
           <control type="edit" format="integer" />
         </setting>
+        <setting id="ASSUREDBUFFERDURATION" type="integer" label="30200">
+          <level>1</level>
+          <default>60</default>
+          <control type="edit" format="integer" />
+        </setting> 
+        <setting id="MAXBUFFERDURATION" type="integer" label="30201">
+          <level>1</level>
+          <default>120</default>
+          <control type="edit" format="integer" />
+        </setting>
+        <setting id="IGNOREWINDOWCHANGE" type="boolean" label="30202">
+          <level>1</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting> 
         <setting id="MAXRESOLUTION" type="integer" label="30110">
           <level>0</level>
           <default>0</default>

diff --git a/lib/libbento4/Core/Ap4FragmentSampleTable.cpp b/lib/libbento4/Core/Ap4FragmentSampleTable.cpp
@@ -225,7 +225,8 @@ AP4_FragmentSampleTable::AddTrun(AP4_TrunAtom*   trun,
 
         // dts and cts
         sample.SetDts(dts);
-        if (trun_flags & AP4_TRUN_FLAG_SAMPLE_COMPOSITION_TIME_OFFSET_PRESENT) {
+        if (trun_flags & AP4_TRUN_FLAG_SAMPLE_COMPOSITION_TIME_OFFSET_PRESENT)
+        {
             sample.SetCtsDelta(entry.sample_composition_time_offset);
         }