sync with upstreamMatrix

113 files changed, 4178 insertions, 1243 deletions

diff --git a/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt b/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
index db25aa2..a346242 100644
--- a/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
+++ b/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
@@ -1 +1 @@
-pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer master
\ No newline at end of file
+pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer Matrix
\ No newline at end of file
diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt
index 897420f..5a9aef2 100644
--- a/cmake/installdata/common/addons.txt
+++ b/cmake/installdata/common/addons.txt
@@ -42,5 +42,7 @@ addons/metadata.common.themoviedb.org/*
 addons/metadata.generic.albums/*
 addons/metadata.generic.artists/*
 addons/metadata.themoviedb.org/*
+addons/metadata.themoviedb.org.python/*
 addons/metadata.tvshows.themoviedb.org/*
+addons/metadata.tvshows.themoviedb.org.python/*
 addons/kodi.vfs/*
diff --git a/cmake/modules/FindCCache.cmake b/cmake/modules/FindCCache.cmake
index a18d4e0..0f6463b 100644
--- a/cmake/modules/FindCCache.cmake
+++ b/cmake/modules/FindCCache.cmake
@@ -16,8 +16,8 @@ if(CCACHE_FOUND)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
 
-  file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n")
-  file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n")
+  file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n")
+  file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n")
   execute_process(COMMAND chmod +x "${CMAKE_BINARY_DIR}/launch-c" "${CMAKE_BINARY_DIR}/launch-cxx")
 
   set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/launch-c" PARENT_SCOPE)
diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake
index 465ecc6..3a10b06 100644
--- a/cmake/modules/FindCdio.cmake
+++ b/cmake/modules/FindCdio.cmake
@@ -11,6 +11,7 @@
 
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_CDIO libcdio>=0.80 QUIET)
+  pkg_check_modules(PC_CDIOPP libcdio++>=2.1.0 QUIET)
 endif()
 
 find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
@@ -19,7 +20,14 @@ find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
 find_library(CDIO_LIBRARY NAMES cdio libcdio
                           PATHS ${PC_CDIO_LIBDIR})
 
-set(CDIO_VERSION ${PC_CDIO_VERSION})
+if(DEFINED PC_CDIO_VERSION AND DEFINED PC_CDIOPP_VERSION AND NOT "${PC_CDIO_VERSION}" VERSION_EQUAL "${PC_CDIOPP_VERSION}")
+  message(WARNING "Detected libcdio (${PC_CDIO_VERSION}) and libcdio++ (${PC_CDIOPP_VERSION}) version mismatch. libcdio++ will not be used.")
+else()
+  find_path(CDIOPP_INCLUDE_DIR NAMES cdio++/cdio.hpp
+                               PATHS ${PC_CDIOPP_INCLUDEDIR} ${CDIO_INCLUDE_DIR})
+
+  set(CDIO_VERSION ${PC_CDIO_VERSION})
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Cdio
@@ -31,4 +39,4 @@ if(CDIO_FOUND)
   set(CDIO_INCLUDE_DIRS ${CDIO_INCLUDE_DIR})
 endif()
 
-mark_as_advanced(CDIO_INCLUDE_DIR CDIO_LIBRARY)
+mark_as_advanced(CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR CDIO_LIBRARY)
diff --git a/cmake/modules/FindIso9660pp.cmake b/cmake/modules/FindIso9660pp.cmake
index 5f84b55..f98273b 100644
--- a/cmake/modules/FindIso9660pp.cmake
+++ b/cmake/modules/FindIso9660pp.cmake
@@ -15,6 +15,8 @@ if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_ISO9660 libiso9660>=2.1.0 QUIET)
 endif()
 
+find_package(Cdio)
+
 find_path(ISO9660PP_INCLUDE_DIR NAMES cdio++/iso9660.hpp
                                 PATHS ${PC_ISO9660PP_INCLUDEDIR})
 
@@ -31,12 +33,12 @@ set(ISO9660PP_VERSION ${PC_ISO9660PP_VERSION})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Iso9660pp
-                                  REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR
+                                  REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR CDIO_LIBRARY CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR
                                   VERSION_VAR ISO9660PP_VERSION)
 
 if(ISO9660PP_FOUND)
-  set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY})
-  set(ISO9660PP_INCLUDE_DIRS ${ISO9660PP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR})
+  set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY} ${CDIO_LIBRARY})
+  set(ISO9660PP_INCLUDE_DIRS ${CDIO_INCLUDE_DIR} ${CDIOPP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR} ${ISO9660PP_INCLUDE_DIR})
   set(ISO9660PP_DEFINITIONS -DHAS_ISO9660PP=1)
 endif()
 
diff --git a/cmake/modules/FindPulseAudio.cmake b/cmake/modules/FindPulseAudio.cmake
index 2ef7910..829a2d8 100644
--- a/cmake/modules/FindPulseAudio.cmake
+++ b/cmake/modules/FindPulseAudio.cmake
@@ -14,14 +14,10 @@
 #
 #   PulseAudio::PulseAudio   - The PulseAudio library
 
-if(NOT PulseAudio_FIND_VERSION)
-  set(PulseAudio_FIND_VERSION 2.0.0)
-endif()
-
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_PULSEAUDIO libpulse>=${PulseAudio_FIND_VERSION} QUIET)
-  pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib QUIET)
-  pkg_check_modules(PC_PULSEAUDIO_SIMPLE libpulse-simple QUIET)
+  pkg_check_modules(PC_PULSEAUDIO libpulse>=11.0.0 QUIET)
+  pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib>=11.0.0 QUIET)
+  pkg_check_modules(PC_PULSEAUDIO_SIMPLE libpulse-simple>=11.0.0 QUIET)
 endif()
 
 find_path(PULSEAUDIO_INCLUDE_DIR NAMES pulse/pulseaudio.h pulse/simple.h
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index e39d4e5..7bbda13 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -10,8 +10,8 @@ if(PKG_CONFIG_FOUND)
 endif()
 
 find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH)
-find_library(PYTHON_LIBRARY NAMES python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR})
-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.8 python3.7 python3.6 python3.5)
+find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR})
+find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5)
 
 if(KODI_DEPENDSBUILD)
   find_library(FFI_LIBRARY ffi REQUIRED)
diff --git a/cmake/modules/FindVAAPI.cmake b/cmake/modules/FindVAAPI.cmake
index 2111e4f..f0a5d05 100644
--- a/cmake/modules/FindVAAPI.cmake
+++ b/cmake/modules/FindVAAPI.cmake
@@ -24,14 +24,14 @@ find_path(VAAPI_libva-drm_INCLUDE_DIR va/va_drm.h
                                 PATHS ${PC_VAAPI_libva-drm_INCLUDEDIR})
 find_library(VAAPI_libva-drm_LIBRARY NAMES va-drm
                                      PATHS ${PC_VAAPI_libva-drm_LIBDIR})
-if(CORE_PLATFORM_NAME_LC STREQUAL "wayland")
+if("wayland" IN_LIST CORE_PLATFORM_NAME_LC)
   find_path(VAAPI_libva-wayland_INCLUDE_DIR va/va_wayland.h
                                       PATHS ${PC_VAAPI_libva-wayland_INCLUDEDIR})
   find_library(VAAPI_libva-wayland_LIBRARY NAMES va-wayland
                                            PATHS ${PC_VAAPI_libva-wayland_LIBDIR})
   list(APPEND REQUIRED_VARS "VAAPI_libva-wayland_INCLUDE_DIR" "VAAPI_libva-wayland_LIBRARY")
 endif()
-if(CORE_PLATFORM_NAME_LC STREQUAL "x11")
+if("x11" IN_LIST CORE_PLATFORM_NAME_LC)
   find_path(VAAPI_libva-x11_INCLUDE_DIR va/va_x11.h
                                   PATHS ${PC_VAAPI_libva-x11_INCLUDEDIR})
   find_library(VAAPI_libva-x11_LIBRARY NAMES va-x11
diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake
index 3cfc282..ba229d7 100644
--- a/cmake/modules/FindWaylandpp.cmake
+++ b/cmake/modules/FindWaylandpp.cmake
@@ -11,12 +11,19 @@
 # WAYLANDPP_SCANNER      - path to wayland-scanner++
 
 pkg_check_modules(PC_WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++ QUIET)
-pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET)
+
 if(PC_WAYLANDPP_FOUND)
   pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir)
+else()
+  message(SEND_ERROR "wayland-client++ not found via pkg-config")
 endif()
+
+pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET)
+
 if(PC_WAYLANDPP_SCANNER_FOUND)
   pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp)
+else()
+  message(SEND_ERROR "wayland-scanner++ not found via pkg-config")
 endif()
 
 find_path(WAYLANDPP_INCLUDE_DIR wayland-client.hpp PATHS ${PC_WAYLANDPP_INCLUDEDIR})
diff --git a/cmake/platform/freebsd/x11.cmake b/cmake/platform/freebsd/x11.cmake
index 09cebde..307dac3 100644
--- a/cmake/platform/freebsd/x11.cmake
+++ b/cmake/platform/freebsd/x11.cmake
@@ -1,3 +1,2 @@
-set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
-set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
-set(APP_RENDER_SYSTEM gl)
+list(APPEND PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
+list(APPEND PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake
index 75b23f3..8f17ef6 100644
--- a/cmake/platform/linux/gbm.cmake
+++ b/cmake/platform/linux/gbm.cmake
@@ -1,17 +1,8 @@
-set(PLATFORM_REQUIRED_DEPS EGL GBM LibDRM LibInput Xkbcommon)
-set(PLATFORM_OPTIONAL_DEPS VAAPI)
+list(APPEND PLATFORM_REQUIRED_DEPS EGL GBM LibDRM LibInput Xkbcommon)
+list(APPEND PLATFORM_OPTIONAL_DEPS VAAPI)
 
-set(GBM_RENDER_SYSTEM "" CACHE STRING "Render system to use with GBM: \"gl\" or \"gles\"")
-
-if(GBM_RENDER_SYSTEM STREQUAL "gl")
+if(APP_RENDER_SYSTEM STREQUAL "gl")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
-  set(APP_RENDER_SYSTEM gl)
-elseif(GBM_RENDER_SYSTEM STREQUAL "gles")
+elseif(APP_RENDER_SYSTEM STREQUAL "gles")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES)
-  set(APP_RENDER_SYSTEM gles)
-else()
-  message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the GBM windowing system. Please set GBM_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
 endif()
-
-# __GBM__ is needed by eglplatform.h in case it is included before gbm.h
-list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DEGL_NO_X11 -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml)
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake
index 916b578..1adcd8f 100644
--- a/cmake/platform/linux/wayland.cmake
+++ b/cmake/platform/linux/wayland.cmake
@@ -1,21 +1,14 @@
-set(PLATFORM_REQUIRED_DEPS WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1)
-set(PLATFORM_OPTIONAL_DEPS VAAPI)
+list(APPEND PLATFORM_REQUIRED_DEPS WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1)
+list(APPEND PLATFORM_OPTIONAL_DEPS VAAPI)
 
-set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"")
-
-if(WAYLAND_RENDER_SYSTEM STREQUAL "gl")
+if(APP_RENDER_SYSTEM STREQUAL "gl")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGl EGL)
-  set(APP_RENDER_SYSTEM gl)
-elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles")
+elseif(APP_RENDER_SYSTEM STREQUAL "gles")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES EGL)
-  set(APP_RENDER_SYSTEM gles)
-else()
-  message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the Wayland windowing system. Please set WAYLAND_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
 endif()
 
 set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols)
 set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-# WL_EGL_PLATFORM is needed by eglplatform.h in case it is included before wayland-egl.h
-list(APPEND PLATFORM_DEFINES -DWL_EGL_PLATFORM=1 -DPLATFORM_SETTINGS_FILE=wayland.xml)
+
 # for wayland-extra-protocols.hpp
 include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}")
diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake
index 5d7f3d4..5f5b8c2 100644
--- a/cmake/platform/linux/x11.cmake
+++ b/cmake/platform/linux/x11.cmake
@@ -1,17 +1,9 @@
-set(PLATFORM_REQUIRED_DEPS EGL X XRandR LibDRM)
-set(PLATFORM_OPTIONAL_DEPS VAAPI)
+list(APPEND PLATFORM_REQUIRED_DEPS EGL X XRandR LibDRM)
+list(APPEND PLATFORM_OPTIONAL_DEPS VAAPI)
 
-set(X11_RENDER_SYSTEM "" CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"")
-
-if(X11_RENDER_SYSTEM STREQUAL "gl")
+if(APP_RENDER_SYSTEM STREQUAL "gl")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
   list(APPEND PLATFORM_OPTIONAL_DEPS GLX VDPAU)
-  set(APP_RENDER_SYSTEM gl)
-elseif(X11_RENDER_SYSTEM STREQUAL "gles")
+elseif(APP_RENDER_SYSTEM STREQUAL "gles")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES)
-  set(APP_RENDER_SYSTEM gles)
-else()
-  message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the X11 windowing system. Please set X11_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
 endif()
-
-list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml)
\ No newline at end of file
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index 5b7b411..1dc33af 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -70,6 +70,7 @@ set(package_files strings.xml
                   src/XBMCProperties.java
                   src/XBMCVideoView.java
                   src/XBMCFile.java
+                  src/XBMCURIUtils.java
                   src/channels/SyncChannelJobService.java
                   src/channels/SyncProgramsJobService.java
                   src/channels/model/XBMCDatabase.java
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index d896651..757d3ee 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -221,11 +221,19 @@ function(copy_file_to_buildtree file)
   endif()
 
   if(NOT file STREQUAL ${CMAKE_BINARY_DIR}/${outfile})
-    if(VERBOSE)
-      message(STATUS "copy_file_to_buildtree - copying file: ${file} -> ${CMAKE_BINARY_DIR}/${outfile}")
+    if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" OR NOT IS_SYMLINK "${file}")
+      if(VERBOSE)
+        message(STATUS "copy_file_to_buildtree - copying file: ${file} -> ${CMAKE_BINARY_DIR}/${outfile}")
+      endif()
+      file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake
+           "file(COPY \"${file}\" DESTINATION \"${CMAKE_BINARY_DIR}/${outdir}\")\n" )
+    else()
+      if(VERBOSE)
+        message(STATUS "copy_file_to_buildtree - copying symlinked file: ${file} -> ${CMAKE_BINARY_DIR}/${outfile}")
+      endif()
+      file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake
+           "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy_if_different \"${file}\" \"${CMAKE_BINARY_DIR}/${outfile}\")\n")
     endif()
-    file(APPEND ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ExportFiles.cmake
-         "file(COPY \"${file}\" DESTINATION \"${CMAKE_BINARY_DIR}/${outdir}\")\n")
   endif()
 
   if(NOT arg_NO_INSTALL)
diff --git a/cmake/scripts/common/Platform.cmake b/cmake/scripts/common/Platform.cmake
index 5ac233a..397d8d4 100644
--- a/cmake/scripts/common/Platform.cmake
+++ b/cmake/scripts/common/Platform.cmake
@@ -3,10 +3,13 @@ if(NOT CORE_SYSTEM_NAME)
 endif()
 
 if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
-  # Set default CORE_PLATFORM_NAME to X11
+  # Set default CORE_PLATFORM_NAME to X11 WAYLAND GBM
   # This is overridden by user setting -DCORE_PLATFORM_NAME=<platform>
-  set(_DEFAULT_PLATFORM X11)
-  option(ENABLE_APP_AUTONAME    "Enable renaming the binary according to windowing?" ON)
+  set(_DEFAULT_PLATFORM X11 WAYLAND GBM)
+
+  if(NOT APP_RENDER_SYSTEM)
+    message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering. Please set APP_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
+  endif()
 else()
   string(TOLOWER ${CORE_SYSTEM_NAME} _DEFAULT_PLATFORM)
 endif()
@@ -18,20 +21,37 @@ set(APP_BINARY_SUFFIX ".bin")
 # use the normalized to lower case CORE_PLATFORM_NAME_LC (see below) instead
 #
 if(NOT CORE_PLATFORM_NAME)
-  set(CORE_PLATFORM_NAME ${_DEFAULT_PLATFORM} CACHE STRING "Platform port to build")
+  set(CORE_PLATFORM_NAME ${_DEFAULT_PLATFORM})
 endif()
+set(CORE_PLATFORM_NAME ${CORE_PLATFORM_NAME} CACHE STRING "Platform port to build" FORCE)
 unset(_DEFAULT_PLATFORM)
-string(TOLOWER ${CORE_PLATFORM_NAME} CORE_PLATFORM_NAME_LC)
 
-list(APPEND final_message "Platform: ${CORE_PLATFORM_NAME}")
-if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
-  include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake)
-  if(ENABLE_APP_AUTONAME)
-    set(APP_BINARY_SUFFIX "-${CORE_PLATFORM_NAME_LC}")
+string(REPLACE " " ";" CORE_PLATFORM_NAME "${CORE_PLATFORM_NAME}")
+foreach(platform IN LISTS CORE_PLATFORM_NAME)
+  string(TOLOWER ${platform} platform)
+  list(APPEND CORE_PLATFORM_NAME_LC ${platform})
+endforeach()
+
+string(REPLACE ";" " " CORE_PLATFORM_STRING "${CORE_PLATFORM_NAME_LC}")
+list(APPEND final_message "Platforms: ${CORE_PLATFORM_STRING}")
+
+if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
+  list(LENGTH CORE_PLATFORM_NAME_LC PLATFORM_COUNT)
+  if(PLATFORM_COUNT EQUAL 1)
+    option(ENABLE_APP_AUTONAME "Enable renaming the binary according to windowing?" ON)
+    if(ENABLE_APP_AUTONAME)
+      set(APP_BINARY_SUFFIX "-${CORE_PLATFORM_NAME_LC}")
+    endif()
   endif()
-else()
-  file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
-                                    ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake)
-  string(REPLACE ".cmake" " " _platformnames ${_platformnames})
-  message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}")
 endif()
+
+foreach(CORE_PLATFORM_LC IN LISTS CORE_PLATFORM_NAME_LC)
+  if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_LC}.cmake)
+    include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_LC}.cmake)
+  else()
+    file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/
+                                      ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake)
+    string(REPLACE ".cmake" " " _platformnames ${_platformnames})
+    message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}")
+  endif()
+endforeach()
diff --git a/cmake/scripts/darwin_embedded/Install.cmake b/cmake/scripts/darwin_embedded/Install.cmake
index af18277..02464ee 100644
--- a/cmake/scripts/darwin_embedded/Install.cmake
+++ b/cmake/scripts/darwin_embedded/Install.cmake
@@ -122,11 +122,6 @@ endif()
 set(DEPENDS_ROOT_FOR_XCODE ${NATIVEPREFIX}/..)
 configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in
                ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh @ONLY)
-               
-if(CORE_PLATFORM_NAME_LC STREQUAL ios)
-  configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
-                 ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh @ONLY)
-endif()
 
 add_custom_target(deb
     COMMAND sh ./mkdeb-darwin_embedded.sh ${CORE_BUILD_CONFIG}
diff --git a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake
index 37d196a..61c76a8 100644
--- a/cmake/scripts/linux/ExtraTargets.cmake
+++ b/cmake/scripts/linux/ExtraTargets.cmake
@@ -14,7 +14,7 @@ if(ENABLE_EVENTCLIENTS AND BLUETOOTH_FOUND)
   endif()
 endif()
 
-if(CORE_PLATFORM_NAME_LC STREQUAL "wayland")
+if("wayland" IN_LIST CORE_PLATFORM_NAME_LC)
   # This cannot go into wayland.cmake since it requires the Wayland dependencies
   # to already be resolved
   set(PROTOCOL_XMLS "${WAYLANDPP_PROTOCOLS_DIR}/presentation-time.xml"
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index 7d8f58b..f723aa2 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -23,6 +23,8 @@ else()
   endif()
 endif()
 
+set(CMAKE_OSX_ARCHITECTURES ${CPU})
+
 # Additional SYSTEM_DEFINES
 list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
 
diff --git a/cmake/scripts/osx/Install.cmake b/cmake/scripts/osx/Install.cmake
index 629bc09..2ae41f5 100644
--- a/cmake/scripts/osx/Install.cmake
+++ b/cmake/scripts/osx/Install.cmake
@@ -52,6 +52,7 @@ add_custom_target(dmg
             "DEV_TEAM=${DEV_TEAM}"
             "EXPANDED_CODE_SIGN_IDENTITY_NAME=${CODE_SIGN_IDENTITY}"
             "PLATFORM_NAME=${PLATFORM}"
+            "XCODE_BUILDTYPE=${CMAKE_CFG_INTDIR}"
             ./mkdmg-osx.sh ${CORE_BUILD_CONFIG_LOWERCASED}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx)
 set_target_properties(dmg PROPERTIES FOLDER "Build Utilities")
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index f3628f2..9c382da 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -32,9 +32,11 @@ set(DEPS_FOLDER_RELATIVE project/BuildDependencies)
 set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/${ARCH})
 set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH})
 
+# mingw libs
 list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
-list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
+# dependencies
+list(PREPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
 
 # -------- Compiler options ---------
 
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index ad55a01..5a90683 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -52,7 +52,7 @@ set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-$
 list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
 # dependencies
-list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
+list(PREPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
 
 
 # -------- Compiler options ---------
diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
index 1988d5b..ac1ee12 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -9,10 +9,12 @@ xbmc/addons/interfaces/gui/controls             addons_interfaces_gui_controls
 xbmc/addons/interfaces/gui/dialogs              addons_interfaces_gui_dialogs
 xbmc/addons/kodi-dev-kit/include/kodi addons_kodi-dev-kit_include_kodi
 xbmc/addons/kodi-dev-kit/include/kodi/addon-instance addons_kodi-dev-kit_include_kodi_addon-instance
+xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream addons_kodi-dev-kit_include_kodi_addon-instance_inputstream
 xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral addons_kodi-dev-kit_include_kodi_addon-instance_peripheral
 xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr addons_kodi-dev-kit_include_kodi_addon-instance_pvr
 xbmc/addons/kodi-dev-kit/include/kodi/c-api addons_kodi-dev-kit_include_kodi_c-api
 xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance addons_kodi-dev-kit_include_kodi_c-api_addon-instance
+xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream addons_kodi-dev-kit_include_kodi_c-api_addon-instance_inputstream
 xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr addons_kodi-dev-kit_include_kodi_c-api_addon-instance_pvr
 xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui addons_kodi-dev-kit_include_kodi_c-api_gui
 xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls addons_kodi-dev-kit_include_kodi_c-api_gui_controls
diff --git a/version.txt b/version.txt
index 260b336..4cef763 100644
--- a/version.txt
+++ b/version.txt
@@ -1,12 +1,12 @@
 APP_NAME Kodi
 COMPANY_NAME XBMC Foundation
-COPYRIGHT_YEARS 2005-2020
+COPYRIGHT_YEARS 2005-2021
 WEBSITE http://kodi.tv
 VERSION_MAJOR 19
 VERSION_MINOR 0
-VERSION_TAG ALPHA2
-VERSION_CODE 18.9.702
-ADDON_API 18.9.702
+VERSION_TAG
+VERSION_CODE 19.0.0
+ADDON_API 19.0.0
 ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv
 APP_PACKAGE org.xbmc.kodi
 PACKAGE_IDENTITY XBMCFoundation.Kodi
diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake
index 11cf190..b89478e 100644
--- a/xbmc/addons/AddonBindings.cmake
+++ b/xbmc/addons/AddonBindings.cmake
@@ -8,5 +8,4 @@ set(CORE_ADDON_BINDINGS_FILES
 
 set(CORE_ADDON_BINDINGS_DIRS
     ${CORE_SOURCE_DIR}/xbmc/addons/kodi-dev-kit/include/kodi/
-    ${CORE_SOURCE_DIR}/xbmc/cores/VideoPlayer/Interface/Addon
 )
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h
index 6ab4159..06b22d5 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h
@@ -32,7 +32,7 @@ namespace kodi
 namespace gui
 {
 struct IRenderHelper;
-} // namespace gui
+} /* namespace gui */
 
 //==============================================================================
 /// @ingroup cpp_kodi_Defs
@@ -65,7 +65,8 @@ using HardwareContext = ADDON_HARDWARE_CONTEXT;
 //==============================================================================
 /// @ingroup cpp_kodi_addon_addonbase_Defs
 /// @defgroup cpp_kodi_addon_addonbase_Defs_CSettingValue class CSettingValue
-/// @brief Inside addon main instance used helper class to give settings value.
+/// @brief **Setting value handler**\n
+/// Inside addon main instance used helper class to give settings value.
 ///
 /// This is used on @ref addon::CAddonBase::SetSetting() to inform addon about
 /// settings change by used. This becomes then used to give the related value
@@ -311,23 +312,55 @@ private:
   bool m_owner = false;
 };
 
-/// Add-on main instance class.
+//============================================================================
+/// @addtogroup cpp_kodi_addon_addonbase
+/// @brief **Add-on main instance class**\n
+/// This is the addon main class, similar to an <b>`int main()`</b> in executable and
+/// carries out initial work and later management of it.
+///
 class ATTRIBUTE_HIDDEN CAddonBase
 {
 public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Addon base class constructor.
+  ///
   CAddonBase()
   {
     m_interface->toAddon->destroy = ADDONBASE_Destroy;
-    m_interface->toAddon->get_status = ADDONBASE_GetStatus;
     m_interface->toAddon->create_instance = ADDONBASE_CreateInstance;
     m_interface->toAddon->destroy_instance = ADDONBASE_DestroyInstance;
     m_interface->toAddon->set_setting = ADDONBASE_SetSetting;
   }
+  //----------------------------------------------------------------------------
 
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Destructor.
+  ///
   virtual ~CAddonBase() = default;
+  //----------------------------------------------------------------------------
 
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Main addon creation function
+  ///
+  /// With this function addon can carry out necessary work which is required
+  /// at later points or start necessary processes.
+  ///
+  /// This function is optional and necessary work can also be carried out
+  /// using @ref CreateInstance (if it concerns any instance types).
+  ///
+  /// @return @ref ADDON_STATUS_OK if correct, for possible errors see
+  ///         @ref ADDON_STATUS
+  ///
+  /// @note Terminating the add-on must be carried out using the class destructor
+  /// given by child.
+  ///
   virtual ADDON_STATUS Create() { return ADDON_STATUS_OK; }
+  //----------------------------------------------------------------------------
 
+  // obsolete
   virtual ADDON_STATUS GetStatus() { return ADDON_STATUS_OK; }
 
   //============================================================================
@@ -391,7 +424,7 @@ public:
   /// @ingroup cpp_kodi_addon_addonbase
   /// @brief Instance created
   ///
-  /// @param[in] instanceType The requested type of required instance, see \ref ADDON_TYPE.
+  /// @param[in] instanceType The requested type of required instance, see @ref ADDON_TYPE.
   /// @param[in] instanceID An individual identification key string given by Kodi.
   /// @param[in] instance The instance handler used by Kodi must be passed to
   ///                     the classes created here. See in the example.
@@ -401,8 +434,8 @@ public:
   ///                    that it can handle differences.
   /// @param[out] addonInstance The pointer to instance class created in addon.
   ///                           Needed to be able to identify them on calls.
-  /// @return                   \ref ADDON_STATUS_OK if correct, for possible errors
-  ///                           see \ref ADDON_STATUS
+  /// @return                   @ref ADDON_STATUS_OK if correct, for possible errors
+  ///                           see @ref ADDON_STATUS
   ///
   ///
   /// --------------------------------------------------------------------------
@@ -414,8 +447,8 @@ public:
   ///
   /// ...
   ///
-  /// /* If you use only one instance in your add-on, can be instanceType and
-  ///  * instanceID ignored */
+  /// // If you use only one instance in your add-on, can be instanceType and
+  /// // instanceID ignored
   /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
   ///                                       const std::string& instanceID,
   ///                                       KODI_HANDLE instance,
@@ -462,7 +495,7 @@ public:
   /// This function is optional and intended to notify addon that the instance
   /// is terminating.
   ///
-  /// @param[in] instanceType   The requested type of required instance, see \ref ADDON_TYPE.
+  /// @param[in] instanceType   The requested type of required instance, see @ref ADDON_TYPE.
   /// @param[in] instanceID     An individual identification key string given by Kodi.
   /// @param[in] addonInstance  The pointer to instance class created in addon.
   ///
@@ -483,25 +516,19 @@ public:
   static AddonGlobalInterface*
       m_interface; // Interface function table to hold addresses on add-on and from kodi
 
-  /*private:*/ /* Needed public as long the old call functions becomes used! */
+private:
   static inline void ADDONBASE_Destroy()
   {
     delete static_cast<CAddonBase*>(m_interface->addonBase);
     m_interface->addonBase = nullptr;
   }
 
-  static inline ADDON_STATUS ADDONBASE_GetStatus()
-  {
-    return static_cast<CAddonBase*>(m_interface->addonBase)->GetStatus();
-  }
-
   static inline ADDON_STATUS ADDONBASE_SetSetting(const char* settingName, const void* settingValue)
   {
     return static_cast<CAddonBase*>(m_interface->addonBase)
         ->SetSetting(settingName, CSettingValue(settingValue));
   }
 
-private:
   static inline ADDON_STATUS ADDONBASE_CreateInstance(int instanceType,
                                                       const char* instanceID,
                                                       KODI_HANDLE instance,
@@ -591,7 +618,7 @@ private:
 } /* namespace addon */
 
 //==============================================================================
-/// @ingroup cpp_kodi_addon
+/// @ingroup cpp_kodi
 /// @brief To get used version inside Kodi itself about asked type.
 ///
 /// This thought to allow a addon a handling of newer addon versions within
@@ -613,6 +640,11 @@ inline std::string ATTRIBUTE_HIDDEN GetKodiTypeVersion(int type)
 //------------------------------------------------------------------------------
 
 //==============================================================================
+/// @ingroup cpp_kodi
+/// @brief To get the addon system installation folder.
+///
+/// @param[in] append [optional] Path to append to given string
+/// @return Path where addon is installed
 ///
 inline std::string ATTRIBUTE_HIDDEN GetAddonPath(const std::string& append = "")
 {
@@ -637,6 +669,14 @@ inline std::string ATTRIBUTE_HIDDEN GetAddonPath(const std::string& append = "")
 //------------------------------------------------------------------------------
 
 //==============================================================================
+/// @ingroup cpp_kodi
+/// @brief To get the user-related folder of the addon.
+///
+/// @note This folder is not created automatically and has to be created by the
+/// addon the first time.
+///
+/// @param[in] append [optional] Path to append to given string
+/// @return User path of addon
 ///
 inline std::string ATTRIBUTE_HIDDEN GetBaseUserPath(const std::string& append = "")
 {
@@ -661,6 +701,19 @@ inline std::string ATTRIBUTE_HIDDEN GetBaseUserPath(const std::string& append =
 //------------------------------------------------------------------------------
 
 //==============================================================================
+/// @ingroup cpp_kodi
+/// @brief This function gives OS associated executable binary path of the addon.
+///
+/// With some systems this can differ from the addon path at @ref GetAddonPath.
+///
+/// As an example on Linux:
+/// - Addon path is at `/usr/share/kodi/addons/YOUR_ADDON_ID`
+/// - Library path is at `/usr/lib/kodi/addons/YOUR_ADDON_ID`
+///
+/// @note In addition, in this function, for a given folder, the add-on path
+/// itself, but its parent.
+///
+/// @return Kodi's sytem library path where related addons are installed.
 ///
 inline std::string ATTRIBUTE_HIDDEN GetLibPath()
 {
@@ -1223,6 +1276,11 @@ inline void ATTRIBUTE_HIDDEN SetSettingEnum(const std::string& settingName, enum
 /*!@}*/
 
 //============================================================================
+/// @ingroup cpp_kodi
+/// @brief Get to related @ref ADDON_STATUS a human readable text.
+///
+/// @param[in] status Status value to get name for
+/// @return Wanted name, as "Unknown" if status not known
 ///
 inline std::string ATTRIBUTE_HIDDEN TranslateAddonStatus(ADDON_STATUS status)
 {
@@ -1279,16 +1337,102 @@ inline void* GetInterface(const std::string& name, const std::string& version)
 
 } /* namespace kodi */
 
-/*! addon creation macro
- * @todo cleanup this stupid big macro
- * This macro includes now all for add-on's needed functions. This becomes a bigger
- * rework after everything is done on Kodi itself, currently is this way needed
- * to have compatibility with not reworked interfaces.
- *
- * Becomes really cleaned up soon :D
- */
+//==============================================================================
+/// @ingroup cpp_kodi_addon_addonbase_Defs
+/// @defgroup cpp_kodi_addon_addonbase_Defs_ADDONCREATORAddonClass macro ADDONCREATOR(AddonClass)
+/// @brief **Addon creation macro**\n
+/// This export the three mandatory "C" functions to have available for Kodi.
+///
+/// @note Only this macro can be used on a C++ addon, everything else is done
+/// automatically.
+///
+/// @param[in] AddonClass Used addon class to be exported with CAddonBase as
+///            parent.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/AddonBash.h>
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS Create() override;
+/// };
+///
+/// ADDON_STATUS CMyAddon::Create()
+/// {
+///   // Some work
+///
+///   return ADDON_STATUS_OK;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// ----------------------------------------------------------------------------
+///
+/// As information, the following functions are exported using this macro:
+/// \table_start
+///   \table_h3{ Function, Use, Description }
+///   \table_row3{   <b>`ADDON_Create(KODI_HANDLE addonInterface\, const char* globalApiVersion\, void* unused)`</b>,
+///                  \anchor ADDON_Create
+///                  _required_,
+///     <b>Addon creation call.</b>
+///     <br>
+///     Like an `int main()` is this the first on addon called place on his start
+///     and create within C++ API related class inside addon.
+///     <br>
+///     @param[in] addonInterface Handle pointer to get Kodi's given table.
+///                               There have addon needed values and functions
+///                               to Kodi and addon must set his functions there
+///                               for Kodi.
+///     @param[in] globalApiVersion This give the main version @ref ADDON_GLOBAL_VERSION_MAIN
+///                                 where currently on Kodi's side.<br>
+///                                 This is unsued on addon as there also other
+///                                 special callback functions for.<br>
+///                                 Only thought for future use if needed earlier.
+///     @param[in] unused This is a not used value\, only there to have in case of
+///                       need no Major API version increase where break current.
+///     @return @ref ADDON_STATUS_OK if correct\, for possible errors see
+///             @ref ADDON_STATUS.
+///     <p>
+///   }
+///   \table_row3{   <b>`const char* ADDON_GetTypeVersion(int type)`</b>,
+///                  \anchor ADDON_GetTypeVersion
+///                  _required_,
+///     <b>Ask addon about version of given type.</b>
+///     <br>
+///     This is used to query its associated version in the addon before work
+///     is carried out in it and the Kodi can adapt to it.
+///     <br>
+///     @param[in] type With @ref ADDON_TYPE defined type to ask.
+///     @return Version as string of asked type.
+///     <p>
+///   }
+///   \table_row3{   <b>`const char* ADDON_GetTypeMinVersion(int type)`</b>,
+///                  \anchor ADDON_GetTypeMinVersion
+///                  _optional_,
+///     <b>Ask addon about minimal version of given type.</b>
+///     <br>
+///     This is used to query its associated min version in the addon before work
+///     is carried out in it and the Kodi can adapt to it.
+///     <br>
+///     @note The minimum version is optional\, if it were not available\, the
+///     major version is used instead.
+///     <br>
+///     @param[in] type With @ref ADDON_TYPE defined type to ask.
+///     @return Min version as string of asked type.
+///     <p>
+///   }
+/// \table_end
+///
 #define ADDONCREATOR(AddonClass) \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_Create( \
+  extern "C" ATTRIBUTE_DLL_EXPORT ADDON_STATUS ADDON_Create( \
       KODI_HANDLE addonInterface, const char* /*globalApiVersion*/, void* /*unused*/) \
   { \
     kodi::addon::CAddonBase::m_interface = static_cast<AddonGlobalInterface*>(addonInterface); \
@@ -1296,27 +1440,15 @@ inline void* GetInterface(const std::string& name, const std::string& version)
     return static_cast<kodi::addon::CAddonBase*>(kodi::addon::CAddonBase::m_interface->addonBase) \
         ->Create(); \
   } \
-  extern "C" __declspec(dllexport) void ADDON_Destroy() \
-  { \
-    kodi::addon::CAddonBase::ADDONBASE_Destroy(); \
-  } \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_GetStatus() \
-  { \
-    return kodi::addon::CAddonBase::ADDONBASE_GetStatus(); \
-  } \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_SetSetting(const char* settingName, \
-                                                                 const void* settingValue) \
-  { \
-    return kodi::addon::CAddonBase::ADDONBASE_SetSetting(settingName, settingValue); \
-  } \
-  extern "C" __declspec(dllexport) const char* ADDON_GetTypeVersion(int type) \
+  extern "C" ATTRIBUTE_DLL_EXPORT const char* ADDON_GetTypeVersion(int type) \
   { \
     return kodi::addon::GetTypeVersion(type); \
   } \
-  extern "C" __declspec(dllexport) const char* ADDON_GetTypeMinVersion(int type) \
+  extern "C" ATTRIBUTE_DLL_EXPORT const char* ADDON_GetTypeMinVersion(int type) \
   { \
     return kodi::addon::GetTypeMinVersion(type); \
   } \
   AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr;
+//------------------------------------------------------------------------------
 
 #endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h b/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h
index 36d1dd1..c6f8c4f 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/AudioEngine.h
@@ -68,7 +68,7 @@ namespace audioengine
 ///
 /// ------------------------------------------------------------------------
 ///
-/// It has the header \ref AudioEngine.h "#include <kodi/AudioEngine.h>" be included
+/// It has the header @ref AudioEngine.h "#include <kodi/AudioEngine.h>" be included
 /// to enjoy it.
 ///
 //------------------------------------------------------------------------------
@@ -262,8 +262,8 @@ public:
   /// @brief Contructs new class to an Kodi IAEStream in the format specified.
   ///
   /// @param[in] format       The data format the incoming audio will be in
-  ///                         (e.g. \ref AUDIOENGINE_FMT_S16LE)
-  /// @param[in] options      [opt] A bit field of stream options (see: enum \ref AudioEngineStreamOptions)
+  ///                         (e.g. @ref AUDIOENGINE_FMT_S16LE)
+  /// @param[in] options      [opt] A bit field of stream options (see: enum @ref AudioEngineStreamOptions)
   ///
   ///
   /// ------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt
index d37078a..298b5de 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/CMakeLists.txt
@@ -3,8 +3,6 @@ set(HEADERS AddonBase.h
             Filesystem.h
             General.h
             Network.h
-            StreamCodec.h
-            StreamCrypto.h
             versions.h)
 
 if(CORE_SYSTEM_NAME STREQUAL android)
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h
index 1cf05fe..9e05983 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/Filesystem.h
@@ -91,7 +91,7 @@ namespace vfs
 /// @brief **File information status**\n
 /// Used on kodi::vfs::StatFile() to get detailed information about a file.
 ///
-//@{
+///@{
 class ATTRIBUTE_HIDDEN FileStatus : public kodi::addon::CStructHdl<FileStatus, STAT_STRUCTURE>
 {
 public:
@@ -102,7 +102,7 @@ public:
   FileStatus(STAT_STRUCTURE* channel) : CStructHdl(channel) {}
   /*! \endcond */
 
-  /// @defgroup cpp_kodi_vfs_Defs_FileStatus_Help *Value Help*
+  /// @defgroup cpp_kodi_vfs_Defs_FileStatus_Help Value Help
   /// @ingroup cpp_kodi_vfs_Defs_FileStatus
   /// ----------------------------------------------------------------------------
   ///
@@ -126,7 +126,7 @@ public:
 
   /// @addtogroup cpp_kodi_vfs_Defs_FileStatus
   /// @copydetails cpp_kodi_vfs_Defs_FileStatus_Help
-  //@{
+  ///@{
 
   /// @brief Set ID of device containing file.
   void SetDeviceId(uint32_t deviceId) { m_cStructure->deviceId = deviceId; }
@@ -208,9 +208,9 @@ public:
 
   /// @brief Get stat url is a regular.
   bool GetIsSocket() const { return m_cStructure->isSocket; }
-  //@}
+  ///@}
 };
-//@}
+///@}
 //------------------------------------------------------------------------------
 
 //==============================================================================
@@ -220,7 +220,7 @@ public:
 /// Used on kodi::vfs::CFile::IoControlGetCacheStatus() to get running cache
 /// status of proccessed stream.
 ///
-//@{
+///@{
 class ATTRIBUTE_HIDDEN CacheStatus
   : public kodi::addon::CStructHdl<CacheStatus, VFS_CACHE_STATUS_DATA>
 {
@@ -232,7 +232,7 @@ public:
   CacheStatus(VFS_CACHE_STATUS_DATA* channel) : CStructHdl(channel) {}
   /*! \endcond */
 
-  /// @defgroup cpp_kodi_vfs_Defs_CacheStatus_Help *Value Help*
+  /// @defgroup cpp_kodi_vfs_Defs_CacheStatus_Help Value Help
   /// @ingroup cpp_kodi_vfs_Defs_CacheStatus
   /// ----------------------------------------------------------------------------
   ///
@@ -247,7 +247,7 @@ public:
 
   /// @addtogroup cpp_kodi_vfs_Defs_CacheStatus
   /// @copydetails cpp_kodi_vfs_Defs_CacheStatus_Help
-  //@{
+  ///@{
 
   /// @brief Set number of bytes cached forward of current position.
   void SetForward(uint64_t forward) { m_cStructure->forward = forward; }
@@ -273,9 +273,9 @@ public:
   /// @brief Get cache low speed condition detected.
   bool GetLowspeed() { return m_cStructure->lowspeed; }
 
-  //@}
+  ///@}
 };
-//@}
+///@}
 //------------------------------------------------------------------------------
 
 //==============================================================================
@@ -318,7 +318,7 @@ public:
   }
   //--------------------------------------------------------------------------
 
-  /// @defgroup cpp_kodi_vfs_Defs_HttpHeader_Help *Value Help*
+  /// @defgroup cpp_kodi_vfs_Defs_HttpHeader_Help Value Help
   /// @ingroup cpp_kodi_vfs_Defs_HttpHeader
   ///
   /// <b>The following table contains values that can be get with @ref cpp_kodi_vfs_Defs_HttpHeader :</b>
@@ -382,6 +382,7 @@ public:
     if (res)
     {
       std::vector<std::string> vecReturn;
+      vecReturn.reserve(numValues);
       for (int i = 0; i < numValues; ++i)
       {
         vecReturn.emplace_back(res[i]);
@@ -537,7 +538,7 @@ public:
 /// It has the header @ref Filesystem.h "#include <kodi/Filesystem.h>" be included
 /// to enjoy it.
 ///
-//@{
+///@{
 class ATTRIBUTE_HIDDEN CDirEntry
 {
 public:
@@ -580,7 +581,7 @@ public:
   }
   //----------------------------------------------------------------------------
 
-  /// @defgroup cpp_kodi_vfs_CDirEntry_Help *Value Help*
+  /// @defgroup cpp_kodi_vfs_CDirEntry_Help Value Help
   /// @ingroup cpp_kodi_vfs_CDirEntry
   /// --------------------------------------------------------------------------
   ///
@@ -598,7 +599,7 @@ public:
 
   /// @addtogroup cpp_kodi_vfs_CDirEntry
   /// @copydetails cpp_kodi_vfs_CDirEntry_Help
-  //@{
+  ///@{
 
   //============================================================================
   /// @brief Get the directory entry name.
@@ -723,7 +724,7 @@ public:
   const std::map<std::string, std::string>& GetProperties() const { return m_properties; }
   //----------------------------------------------------------------------------
 
-  //@}
+  ///@}
 
 private:
   std::string m_label;
@@ -734,7 +735,7 @@ private:
   int64_t m_size;
   time_t m_dateTime;
 };
-//@}
+///@}
 //------------------------------------------------------------------------------
 
 //}}}
@@ -1823,7 +1824,7 @@ inline bool ATTRIBUTE_HIDDEN GetCookies(const std::string& url, std::string& coo
 ///
 /// ~~~~~~~~~~~~~
 ///
-//@{
+///@{
 class ATTRIBUTE_HIDDEN CFile
 {
 public:
@@ -2324,6 +2325,7 @@ public:
     if (res)
     {
       std::vector<std::string> vecReturn;
+      vecReturn.reserve(numValues);
       for (int i = 0; i < numValues; ++i)
       {
         vecReturn.emplace_back(res[i]);
@@ -2356,7 +2358,7 @@ public:
 private:
   void* m_file = nullptr;
 };
-//@}
+///@}
 //------------------------------------------------------------------------------
 
 //}}}
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/General.h b/xbmc/addons/kodi-dev-kit/include/kodi/General.h
index 3fad5a0..ab9452b 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/General.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/General.h
@@ -787,7 +787,7 @@ inline bool ATTRIBUTE_HIDDEN GetKeyboardLayout(int modifierKey,
 /// @param[out] layout_name new name of used layout (input string not used!)
 /// @return true if request successed
 ///
-/// @note \ref GetKeyboardLayout must be called afterwards.
+/// @note @ref GetKeyboardLayout must be called afterwards.
 ///
 ///
 /// ------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-dev-kit/include/kodi/StreamCrypto.h
deleted file mode 100644
index 8008aa1..0000000
--- a/xbmc/addons/kodi-dev-kit/include/kodi/StreamCrypto.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (C) 2017-2018 Team Kodi
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#include <inttypes.h>
-#include <string.h>
-
-#define STREAMCRYPTO_VERSION_LEVEL 1
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-  typedef struct CRYPTO_INFO
-  {
-    enum CRYPTO_KEY_SYSTEM : uint8_t
-    {
-      CRYPTO_KEY_SYSTEM_NONE = 0,
-      CRYPTO_KEY_SYSTEM_WIDEVINE,
-      CRYPTO_KEY_SYSTEM_PLAYREADY,
-      CRYPTO_KEY_SYSTEM_WISEPLAY,
-      CRYPTO_KEY_SYSTEM_COUNT
-    } m_CryptoKeySystem; /*!< @brief keysystem for encrypted media, KEY_SYSTEM_NONE for unencrypted media */
-
-    static const uint8_t FLAG_SECURE_DECODER =
-        1; /*!< @brief is set in flags if decoding has to be done in TEE environment */
-
-    uint8_t flags;
-    uint16_t m_CryptoSessionIdSize; /*!< @brief The size of the crypto session key id */
-    const char* m_CryptoSessionId; /*!< @brief The crypto session key id */
-  } CRYPTO_INFO;
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h
index a6bea7d..747225f 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/AudioDecoder.h
@@ -241,7 +241,7 @@ private:
 
 //==============================================================================
 ///
-/// \addtogroup cpp_kodi_addon_audiodecoder
+/// @addtogroup cpp_kodi_addon_audiodecoder
 /// @brief \cpp_class{ kodi::addon::CInstanceAudioDecoder }
 /// **Audio decoder add-on instance**
 ///
@@ -289,9 +289,11 @@ private:
 /// |:------------------------------|----------------------------------------
 /// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.audiodecoder"</b>.
 /// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
-/// | <b>`name`</b>                 | The name of the decoder used in Kodi for display.
 /// | <b>`extension`</b>            | The file extensions / styles supported by this addon.
-/// | <b>`tags`</b>                 | Boolean to point out that addon can bring own information to replayed file, if <b>`false`</b> only the file name is used as info.<br>If <b>`true`</b>, \ref CInstanceAudioDecoder::ReadTag is used and must be implemented.
+/// | <b>`mimetype`</b>             | A stream URL mimetype where can be used to force to this addon.
+/// | <b>`name`</b>                 | The name of the decoder used in Kodi for display.
+/// | <b>`tags`</b>                 | Boolean to point out that addon can bring own information to replayed file, if <b>`false`</b> only the file name is used as info.<br>If <b>`true`</b>, @ref CInstanceAudioDecoder::ReadTag is used and must be implemented.
+/// | <b>`tracks`</b>               | Boolean to in inform one file can contains several different streams.
 ///
 /// --------------------------------------------------------------------------
 ///
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h
index 396b92e..c4c7aca 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -8,682 +8,1757 @@
 
 #pragma once
 
-/*
- * Parts with a comment named "internal" are only used inside header and not
- * used or accessed direct during add-on development!
- */
-
 #include "../AddonBase.h"
-#include "../StreamCodec.h"
-#include "../StreamCrypto.h"
+#include "../c-api/addon-instance/inputstream.h"
+#include "inputstream/StreamCodec.h"
+#include "inputstream/StreamConstants.h"
+#include "inputstream/StreamCrypto.h"
+#include "inputstream/TimingConstants.h"
 
-#ifdef BUILD_KODI_ADDON
-#include "../DemuxPacket.h"
-#include "../InputStreamConstants.h"
-#else
-#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
-#include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h"
-#endif
+#ifdef __cplusplus
 
-//Increment this level always if you add features which can lead to compile failures in the addon
-#define INPUTSTREAM_VERSION_LEVEL 2
+#include <map>
 
-#define INPUTSTREAM_MAX_STREAM_COUNT 256
-#define INPUTSTREAM_MAX_STRING_NAME_SIZE 256
-#define INPUTSTREAM_MAX_STRING_CODEC_SIZE 32
-#define INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE 64
+namespace kodi
+{
+namespace addon
+{
 
-#ifdef __cplusplus
-extern "C"
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Doxygen group set for the definitions
+//{{{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_inputstream
+/// @brief **Inputstream add-on instance definition values**\n
+/// All inputstream functions associated data structures.
+///
+/// Used to exchange the available options between Kodi and addon.\n
+/// The groups described here correspond to the groups of functions on inputstream
+/// instance class.
+///
+/// In addition, some of the things described here are also used on the
+/// @ref cpp_kodi_addon_videocodec "video codec" addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface 1. Interface
+/// @ingroup cpp_kodi_addon_inputstream_Defs
+/// @brief **Inputstream add-on general variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_inputstream_Defs_StreamConstants 2. Stream constants
+/// @ingroup cpp_kodi_addon_inputstream_Defs
+/// @brief **Used to exchange any additional data between the caller and processor.**\n
+/// This includes the standardized values, in addition, an addon can also use
+/// its own special uses to be exchanged in the same way.
+///
+/// These values can be used by other addons (e.g. video addon) or stream files
+/// to select the respective inputstream addon and to transfer additional values.
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+///
+/// This example use the @ref STREAM_PROPERTY_INPUTSTREAM on a <b>`*.strm`</b>
+/// file to select needed addon and a additional value where related to selected
+/// addon itself.
+///
+/// ~~~~~~~~~~~~
+/// #KODIPROP:inputstream=inputstream.adaptive
+/// #KODIPROP:inputstream.adaptive.manifest_type=mpd
+/// http://rdmedia.bbc.co.uk/dash/ondemand/testcard/1/client_manifest-events-multilang.mpd
+/// ~~~~~~~~~~~~
+///
+/// These are then given to Kodi and the respectively selected addon by means of
+/// his @ref kodi::addon::CInstanceInputStream::Open "Open" call
+/// in @ref kodi::addon::InputstreamProperty::GetProperties.
+///
+/// The largest possible amount of these <b>`#KODIPROP`</b> values is defined
+/// with @ref STREAM_MAX_PROPERTY_COUNT.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_inputstream_Defs_TimingConstants 3. Stream timing
+/// @ingroup cpp_kodi_addon_inputstream_Defs
+/// @brief **Timebase and timestamp definitions.**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_inputstream_Defs_StreamCodec 4. Stream codec
+/// @ingroup cpp_kodi_addon_inputstream_Defs
+/// @brief **Inputstream codec control**\n
+/// Used to manage stream codec data.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption 5. Stream encryption
+/// @ingroup cpp_kodi_addon_inputstream_Defs
+/// @brief **Inputstream encryption control**\n
+/// Used to manage encrypted streams within addon.
+///
+
+//}}}
+//______________________________________________________________________________
+
+class CInstanceInputStream;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_InputstreamProperty class InputstreamProperty
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief <b>URL and Data of key/value pairs passed to addon on @ref kodi::addon::CInstanceInputStream::Open "Open".</b>\n
+/// This is used to have the necessary data of the stream to be opened.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_InputstreamProperty_Help
+///
+/// @warning This data are only given from Kodi to addon and can't be used
+/// on other places on addon.
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamProperty
+  : public CStructHdl<InputstreamProperty, INPUTSTREAM_PROPERTY>
 {
-#endif /* __cplusplus */
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  /*! \endcond */
 
-  /*!
-   * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
-   */
-  struct INPUTSTREAM_CAPABILITIES
+public:
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_InputstreamProperty_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_InputstreamProperty
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_InputstreamProperty :</b>
+  /// | Name | Type | Get call
+  /// |------|------|----------
+  /// | **Stream URL** | `std::string` | @ref InputstreamProperty::GetURL "GetURL"
+  /// | **Mime type** | `std::string` | @ref InputstreamProperty::GetMimeType "GetMimeType"
+  /// | **Available amount of properties** | `unsigned int` | @ref InputstreamProperty::GetPropertiesAmount "GetPropertiesAmount"
+  /// | **List of properties** | `std::map<std::string, std::string>` | @ref InputstreamProperty::GetProperties "GetProperties"
+  /// | **Get addon library folder** | `std::string` | @ref InputstreamProperty::GetLibFolder "GetLibFolder"
+  /// | **Get addon profile/user folder** | `std::string` | @ref InputstreamProperty::GetProfileFolder "GetProfileFolder"
+
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_InputstreamProperty
+  ///@{
+
+  /// @brief Stream URL to open.
+  std::string GetURL() const { return m_cStructure->m_strURL; }
+
+  /// @brief Stream mime type.
+  std::string GetMimeType() const { return m_cStructure->m_mimeType; }
+
+  /// @brief Amount of available properties.
+  unsigned int GetPropertiesAmount() const
   {
-    enum MASKTYPE : uint32_t
+    return m_cStructure->m_nCountInfoValues;
+  }
+
+  /// @brief List of available properties-
+  const std::map<std::string, std::string> GetProperties() const
+  {
+    std::map<std::string, std::string> props;
+    for (unsigned int i = 0; i < m_cStructure->m_nCountInfoValues; ++i)
     {
-      /// supports interface IDemux
-      SUPPORTS_IDEMUX = (1 << 0),
+      props.emplace(m_cStructure->m_ListItemProperties[i].m_strKey,
+                    m_cStructure->m_ListItemProperties[i].m_strValue);
+    }
+    return props;
+  }
+
+  /// @brief Get addon library folder.
+  ///
+  /// @note As alternative can also @ref kodi::GetAddonPath used.
+  std::string GetLibFolder() const { return m_cStructure->m_libFolder; }
+
+  /// @brief Get addon profile/user folder.
+  ///
+  /// @note As alternative can also @ref kodi::GetBaseUserPath used.
+  std::string GetProfileFolder() const { return m_cStructure->m_profileFolder; }
+
+  ///@}
+
+private:
+  InputstreamProperty() = delete;
+  InputstreamProperty(const InputstreamProperty& stream) = delete;
+  InputstreamProperty(const INPUTSTREAM_PROPERTY* stream) : CStructHdl(stream) {}
+  InputstreamProperty(INPUTSTREAM_PROPERTY* stream) : CStructHdl(stream) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities class InputstreamCapabilities
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief **InputStream add-on capabilities. All capabilities are set to "false" as default.**\n
+/// Asked to addon on @ref kodi::addon::CInstanceInputStream::GetCapabilities "GetCapabilities".
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamCapabilities
+  : public CStructHdl<InputstreamCapabilities, INPUTSTREAM_CAPABILITIES>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  /*! \endcond */
 
-      /// supports interface IPosTime
-      SUPPORTS_IPOSTIME = (1 << 1),
+public:
+  /*! \cond PRIVATE */
+  InputstreamCapabilities() = default;
+  InputstreamCapabilities(const InputstreamCapabilities& stream) : CStructHdl(stream) {}
+  /*! \endcond */
 
-      /// supports interface IDisplayTime
-      SUPPORTS_IDISPLAYTIME = (1 << 2),
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Capabilities bit mask** | `uint32_t` | @ref InputstreamCapabilities::SetMask "SetMask" | @ref InputstreamCapabilities::GetMask "GetMask"
 
-      /// supports seek
-      SUPPORTS_SEEK = (1 << 3),
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities
+  ///@{
 
-      /// supports pause
-      SUPPORTS_PAUSE = (1 << 4),
+  /// @brief Set of supported capabilities.
+  void SetMask(uint32_t mask) const { m_cStructure->m_mask = mask; }
 
-      /// supports interface ITime
-      SUPPORTS_ITIME = (1 << 5),
+  /// @brief Get of supported capabilities.
+  uint32_t GetMask() const { return m_cStructure->m_mask; }
 
-      /// supports interface IChapter
-      SUPPORTS_ICHAPTER = (1 << 6),
-    };
+  ///@}
 
-    /// set of supported capabilities
-    uint32_t m_mask;
-  };
+private:
+  InputstreamCapabilities(const INPUTSTREAM_CAPABILITIES* stream) : CStructHdl(stream) {}
+  InputstreamCapabilities(INPUTSTREAM_CAPABILITIES* stream) : CStructHdl(stream) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata class InputstreamMasteringMetadata
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief **Mastering metadata.**\n
+/// Describes the metadata for [HDR10](https://en.wikipedia.org/wiki/High-dynamic-range_video).
+///
+/// Used when video is compressed using [High Efficiency Video Coding (HEVC)](https://en.wikipedia.org/wiki/High_Efficiency_Video_Coding).
+/// This is used to describe the capabilities  of the display used to master the
+/// content and the luminance values of the content.
+///
+/// Used on @ref kodi::addon::InputstreamInfo::SetMasteringMetadata and @ref kodi::addon::InputstreamInfo::GetMasteringMetadata.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamMasteringMetadata
+  : public CStructHdl<InputstreamMasteringMetadata, INPUTSTREAM_MASTERING_METADATA>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  friend class InputstreamInfo;
+  /*! \endcond */
 
-  /*!
-   * @brief structure of key/value pairs passed to addon on Open()
-   */
-  struct INPUTSTREAM
+public:
+  /*! \cond PRIVATE */
+  InputstreamMasteringMetadata() = default;
+  InputstreamMasteringMetadata(const InputstreamMasteringMetadata& stream) : CStructHdl(stream) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Chromaticity X coordinates of the red** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryR_ChromaticityX "SetPrimaryR_ChromaticityX" | @ref InputstreamMasteringMetadata::GetPrimaryR_ChromaticityX "GetPrimaryR_ChromaticityX"
+  /// | **Chromaticity Y coordinates of the red** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryR_ChromaticityY "SetPrimaryR_ChromaticityY" | @ref InputstreamMasteringMetadata::GetPrimaryR_ChromaticityY "GetPrimaryR_ChromaticityY"
+  /// | **Chromaticity X coordinates of the green** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryG_ChromaticityX "SetPrimaryG_ChromaticityX" | @ref InputstreamMasteringMetadata::GetPrimaryG_ChromaticityX "GetPrimaryG_ChromaticityX"
+  /// | **Chromaticity Y coordinates of the green** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryG_ChromaticityY "SetPrimaryG_ChromaticityY" | @ref InputstreamMasteringMetadata::GetPrimaryG_ChromaticityY "GetPrimaryG_ChromaticityY"
+  /// | **Chromaticity X coordinates of the blue** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryB_ChromaticityX "SetPrimaryB_ChromaticityX" | @ref InputstreamMasteringMetadata::GetPrimaryB_ChromaticityX "GetPrimaryB_ChromaticityX"
+  /// | **Chromaticity Y coordinates of the blue** | `double` | @ref InputstreamMasteringMetadata::SetPrimaryB_ChromaticityY "SetPrimaryB_ChromaticityY" | @ref InputstreamMasteringMetadata::GetPrimaryB_ChromaticityY "GetPrimaryB_ChromaticityY"
+  /// | **Chromaticity X coordinates of the white point** | `double` | @ref InputstreamMasteringMetadata::SetWhitePoint_ChromaticityX "SetWhitePoint_ChromaticityX" | @ref InputstreamMasteringMetadata::GetWhitePoint_ChromaticityX "GetWhitePoint_ChromaticityX"
+  /// | **Chromaticity Y coordinates of the white point** | `double` | @ref InputstreamMasteringMetadata::SetWhitePoint_ChromaticityY "SetWhitePoint_ChromaticityY" | @ref InputstreamMasteringMetadata::GetWhitePoint_ChromaticityY "GetWhitePoint_ChromaticityY"
+  /// | **Maximum number of bits of the display** | `double` | @ref InputstreamMasteringMetadata::SetLuminanceMax "SetLuminanceMax" | @ref InputstreamMasteringMetadata::GetLuminanceMax "GetLuminanceMax"
+  /// | **Minimum number of bits of the display** | `double` | @ref InputstreamMasteringMetadata::SetLuminanceMin "SetLuminanceMin" | @ref InputstreamMasteringMetadata::GetLuminanceMin "GetLuminanceMin"
+
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata
+  ///@{
+
+  /// @brief Metadata class compare.
+  ///
+  /// To compare the metadata with another one.
+  ///
+  /// @return true if they equal, false otherwise
+  bool operator==(const kodi::addon::InputstreamMasteringMetadata& right) const
   {
-    const char* m_strURL;
-    const char* m_mimeType;
+    if (memcmp(m_cStructure, right.m_cStructure, sizeof(INPUTSTREAM_MASTERING_METADATA)) == 0)
+      return true;
+    return false;
+  }
 
-    unsigned int m_nCountInfoValues;
-    struct LISTITEMPROPERTY
-    {
-      const char* m_strKey;
-      const char* m_strValue;
-    } m_ListItemProperties[STREAM_MAX_PROPERTY_COUNT];
-
-    const char* m_libFolder;
-    const char* m_profileFolder;
-  };
-
-  /*!
-   * @brief Array of stream IDs
-   */
-  struct INPUTSTREAM_IDS
-  {
-    unsigned int m_streamCount;
-    unsigned int m_streamIds[INPUTSTREAM_MAX_STREAM_COUNT];
-  };
-
-  /*!
-   * @brief MASTERING Metadata
-   */
-  struct INPUTSTREAM_MASTERING_METADATA
-  {
-    double primary_r_chromaticity_x;
-    double primary_r_chromaticity_y;
-    double primary_g_chromaticity_x;
-    double primary_g_chromaticity_y;
-    double primary_b_chromaticity_x;
-    double primary_b_chromaticity_y;
-    double white_point_chromaticity_x;
-    double white_point_chromaticity_y;
-    double luminance_max;
-    double luminance_min;
-  };
-
-  /*!
-  * @brief CONTENTLIGHT Metadata
-  */
-  struct INPUTSTREAM_CONTENTLIGHT_METADATA
-  {
-    uint64_t max_cll;
-    uint64_t max_fall;
-  };
-
-  /*!
-   * @brief stream properties
-   */
-  struct INPUTSTREAM_INFO
-  {
-    enum STREAM_TYPE
-    {
-      TYPE_NONE = 0,
-      TYPE_VIDEO,
-      TYPE_AUDIO,
-      TYPE_SUBTITLE,
-      TYPE_TELETEXT,
-      TYPE_RDS,
-    } m_streamType;
-
-    enum Codec_FEATURES : uint32_t
-    {
-      FEATURE_DECODE = 1
-    };
-    uint32_t m_features;
+  /// @brief Set the chromaticity coordinates of the red value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// X coordinate. The values are normalized to 50,000.
+  void SetPrimaryR_ChromaticityX(double value) { m_cStructure->primary_r_chromaticity_x = value; }
+
+  /// @brief Get the chromaticity X coordinates of the red value.
+  double GetPrimaryR_ChromaticityX() { return m_cStructure->primary_r_chromaticity_x; }
+
+  /// @brief The chromaticity coordinates of the red value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// Y coordinate. The values are normalized to 50,000.
+  void SetPrimaryR_ChromaticityY(double value) { m_cStructure->primary_r_chromaticity_y = value; }
+
+  /// @brief Get the chromaticity Y coordinates of the red value.
+  double GetPrimaryR_ChromaticityY() { return m_cStructure->primary_r_chromaticity_y; }
+
+  /// @brief Set the chromaticity coordinates of the green value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// X coordinate. The values are normalized to 50,000.
+  void SetPrimaryG_ChromaticityX(double value) { m_cStructure->primary_g_chromaticity_x = value; }
+
+  /// @brief Get the chromaticity X coordinates of the green value.
+  double GetPrimaryG_ChromaticityX() { return m_cStructure->primary_g_chromaticity_x; }
+
+  /// @brief Set the chromaticity coordinates of the green value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// Y coordinate. The values are normalized to 50,000.
+  void SetPrimaryG_ChromaticityY(double value) { m_cStructure->primary_g_chromaticity_y = value; }
+
+  /// @brief Get the chromaticity Y coordinates of the green value.
+  double GetPrimaryG_ChromaticityY() { return m_cStructure->primary_g_chromaticity_y; }
+
+  /// @brief The chromaticity coordinates of the blue value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// X coordinate. The values are normalized to 50,000.
+  void SetPrimaryB_ChromaticityX(double value) { m_cStructure->primary_b_chromaticity_x = value; }
+
+  /// @brief Get the chromaticity X coordinates of the blue value.
+  double GetPrimaryB_ChromaticityX() { return m_cStructure->primary_b_chromaticity_x; }
+
+  /// @brief The chromaticity coordinates of the blue value in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// Y coordinate. The values are normalized to 50,000.
+  void SetPrimaryB_ChromaticityY(double value) { m_cStructure->primary_b_chromaticity_y = value; }
+
+  /// @brief Get the chromaticity Y coordinates of the blue value.
+  double GetPrimaryB_ChromaticityY() { return m_cStructure->primary_b_chromaticity_y; }
+
+  /// @brief Set the chromaticity coordinates of the white point in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// X coordinate. The values are normalized to 50,000.
+  void SetWhitePoint_ChromaticityX(double value)
+  {
+    m_cStructure->white_point_chromaticity_x = value;
+  }
 
-    enum STREAM_FLAGS : uint32_t
-    {
-      FLAG_NONE = 0x0000,
-      FLAG_DEFAULT = 0x0001,
-      FLAG_DUB = 0x0002,
-      FLAG_ORIGINAL = 0x0004,
-      FLAG_COMMENT = 0x0008,
-      FLAG_LYRICS = 0x0010,
-      FLAG_KARAOKE = 0x0020,
-      FLAG_FORCED = 0x0040,
-      FLAG_HEARING_IMPAIRED = 0x0080,
-      FLAG_VISUAL_IMPAIRED = 0x0100,
-    };
-
-    // Keep in sync with AVColorSpace
-    enum COLORSPACE
-    {
-      COLORSPACE_RGB = 0,
-      COLORSPACE_BT709 = 1,
-      COLORSPACE_UNSPECIFIED = 2,
-      COLORSPACE_UNKNOWN = COLORSPACE_UNSPECIFIED, // compatibility
-      COLORSPACE_RESERVED = 3,
-      COLORSPACE_FCC = 4,
-      COLORSPACE_BT470BG = 5,
-      COLORSPACE_SMPTE170M = 6,
-      COLORSPACE_SMPTE240M = 7,
-      COLORSPACE_YCGCO = 8,
-      COLORSPACE_YCOCG = COLORSPACE_YCGCO,
-      COLORSPACE_BT2020_NCL = 9,
-      COLORSPACE_BT2020_CL = 10,
-      COLORSPACE_SMPTE2085 = 11,
-      COLORSPACE_CHROMA_DERIVED_NCL = 12,
-      COLORSPACE_CHROMA_DERIVED_CL = 13,
-      COLORSPACE_ICTCP = 14,
-      COLORSPACE_MAX
-    };
-
-    // Keep in sync with AVColorPrimaries
-    enum COLORPRIMARIES : int32_t
-    {
-      COLORPRIMARY_RESERVED0 = 0,
-      COLORPRIMARY_BT709 = 1,
-      COLORPRIMARY_UNSPECIFIED = 2,
-      COLORPRIMARY_RESERVED = 3,
-      COLORPRIMARY_BT470M = 4,
-      COLORPRIMARY_BT470BG = 5,
-      COLORPRIMARY_SMPTE170M = 6,
-      COLORPRIMARY_SMPTE240M = 7,
-      COLORPRIMARY_FILM = 8,
-      COLORPRIMARY_BT2020 = 9,
-      COLORPRIMARY_SMPTE428 = 10,
-      COLORPRIMARY_SMPTEST428_1 = COLORPRIMARY_SMPTE428,
-      COLORPRIMARY_SMPTE431 = 11,
-      COLORPRIMARY_SMPTE432 = 12,
-      COLORPRIMARY_JEDEC_P22 = 22,
-      COLORPRIMARY_MAX
-    };
-
-    // Keep in sync with AVColorRange
-    enum COLORRANGE
+  /// @brief Get the chromaticity X coordinates of the white point
+  double GetWhitePoint_ChromaticityX() { return m_cStructure->white_point_chromaticity_x; }
+
+  /// @brief Set the chromaticity coordinates of the white point in the
+  /// [CIE1931](https://en.wikipedia.org/wiki/CIE_1931_color_space) color space.
+  ///
+  /// Y coordinate. The values are normalized to 50,000.
+  void SetWhitePoint_ChromaticityY(double value)
+  {
+    m_cStructure->white_point_chromaticity_y = value;
+  }
+
+  /// @brief Get the chromaticity Y coordinates of the white point.
+  double GetWhitePoint_ChromaticityY() { return m_cStructure->white_point_chromaticity_y; }
+
+  /// @brief Set the maximum number of bits of the display used to master the content.
+  ///
+  /// Values are normalized to 10,000.
+  void SetLuminanceMax(double value) { m_cStructure->luminance_max = value; }
+
+  /// @brief Get the maximum number of bits of the display.
+  double GetLuminanceMax() { return m_cStructure->luminance_max; }
+
+  /// @brief Set the minimum number of bits of the display used to master the content.
+  ///
+  /// Values are normalized to 10,000.
+  void SetLuminanceMin(double value) { m_cStructure->luminance_min = value; }
+
+  /// @brief Get the minimum number of bits of the display.
+  double GetLuminanceMin() { return m_cStructure->luminance_min; }
+
+  ///@}
+
+private:
+  InputstreamMasteringMetadata(const INPUTSTREAM_MASTERING_METADATA* stream) : CStructHdl(stream) {}
+  InputstreamMasteringMetadata(INPUTSTREAM_MASTERING_METADATA* stream) : CStructHdl(stream) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata class InputstreamContentlightMetadata
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief **Contentlight metadata**\n
+/// Describes the metadata for [HDR10](https://en.wikipedia.org/wiki/High-dynamic-range_video).
+/// See also @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata "InputstreamMasteringMetadata".
+///
+/// Used on @ref kodi::addon::InputstreamInfo::SetContentLightMetadata and @ref kodi::addon::InputstreamInfo::GetContentLightMetadata.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamContentlightMetadata
+  : public CStructHdl<InputstreamContentlightMetadata, INPUTSTREAM_CONTENTLIGHT_METADATA>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  friend class InputstreamInfo;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  InputstreamContentlightMetadata() = default;
+  InputstreamContentlightMetadata(const InputstreamContentlightMetadata& stream)
+    : CStructHdl(stream)
+  {
+  }
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Maximum content light level** | `double` | @ref InputstreamContentlightMetadata::SetMaxCll "SetMaxCll" | @ref InputstreamContentlightMetadata::GetMaxCll "GetMaxCll"
+  /// | **Maximum frame average light level** | `double` | @ref InputstreamContentlightMetadata::SetMaxFall "SetMaxFall" | @ref InputstreamContentlightMetadata::GetMaxFall "GetMaxFall"
+
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata
+  ///@{
+
+  /// @brief Metadata class compare.
+  ///
+  /// To compare the metadata with another one.
+  ///
+  /// @return true if they equal, false otherwise
+  bool operator==(const kodi::addon::InputstreamContentlightMetadata& right) const
+  {
+    if (memcmp(m_cStructure, right.m_cStructure, sizeof(INPUTSTREAM_CONTENTLIGHT_METADATA)) == 0)
+      return true;
+    return false;
+  }
+
+  /// @brief Set the maximum content light level (MaxCLL).
+  ///
+  /// This is the bit value corresponding to the brightest pixel used anywhere
+  /// in the content.
+  void SetMaxCll(uint64_t value) { m_cStructure->max_cll = value; }
+
+  /// @brief Get the maximum content light level (MaxCLL).
+  uint64_t GetMaxCll() { return m_cStructure->max_cll; }
+
+  /// @brief Set the maximum frame average light level (MaxFALL).
+  ///
+  /// This is the bit value corresponding to the average luminance of the frame
+  /// which has the brightest average luminance anywhere in the content.
+  void SetMaxFall(uint64_t value) { m_cStructure->max_fall = value; }
+
+  /// @brief Get the maximum frame average light level (MaxFALL).
+  uint64_t GetMaxFall() { return m_cStructure->max_fall; }
+
+  ///@}
+
+private:
+  InputstreamContentlightMetadata(const INPUTSTREAM_CONTENTLIGHT_METADATA* stream)
+    : CStructHdl(stream)
+  {
+  }
+  InputstreamContentlightMetadata(INPUTSTREAM_CONTENTLIGHT_METADATA* stream) : CStructHdl(stream) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo class InputstreamInfo
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief **Inputstream add-on stream info**\n
+/// This is used to give Kodi the associated and necessary data for an open stream.
+///
+/// Used on @ref kodi::addon::CInstanceInputStream::GetStream().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamInfo : public CStructHdl<InputstreamInfo, INPUTSTREAM_INFO>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  InputstreamInfo() = default;
+  InputstreamInfo(const InputstreamInfo& stream) : CStructHdl(stream)
+  {
+    SetCryptoSession(stream.GetCryptoSession());
+    CopyExtraData();
+  }
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo :</b>
+  /// | Name | Type used | Required | Set call | Get call
+  /// |------|-----------|----------|----------|---------
+  /// | **Stream type** | all | yes | @ref InputstreamInfo::SetStreamType "SetStreamType" | @ref InputstreamInfo::GetStreamType "GetStreamType"
+  /// | **Feature flags** | all | yes | @ref InputstreamInfo::SetFeatures "SetFeatures" | @ref InputstreamInfo::GetFeatures "GetFeatures"
+  /// | **Flags** | all | yes | @ref InputstreamInfo::SetFlags "SetFlags" | @ref InputstreamInfo::GetFlags "GetFlags"
+  /// | **Name** | all | no | @ref InputstreamInfo::SetName "SetName" | @ref InputstreamInfo::GetName "GetName"
+  /// | **Codec name** | all | yes | @ref InputstreamInfo::SetCodecName "SetCodecName" | @ref InputstreamInfo::GetCodecName "GetCodecName"
+  /// | **Codec internal name** | all | no | @ref InputstreamInfo::SetCodecInternalName "SetCodecInternalName" | @ref InputstreamInfo::GetCodecInternalName "GetCodecInternalName"
+  /// | **Codec Profile** | all | no | @ref InputstreamInfo::SetCodecProfile "SetCodecProfile" | @ref InputstreamInfo::GetCodecProfile "GetCodecProfile"
+  /// | **Physical index** | all | yes | @ref InputstreamInfo::SetPhysicalIndex "SetPhysicalIndex" | @ref InputstreamInfo::GetPhysicalIndex "GetPhysicalIndex"
+  /// | **Extra data** | Subtitle / all | Type related required | @ref InputstreamInfo::SetExtraData "SetExtraData" | @ref InputstreamInfo::GetExtraData "GetExtraData"
+  /// | **RFC 5646 language code** | all | no | @ref InputstreamInfo::SetLanguage "SetLanguage" | @ref InputstreamInfo::GetLanguage "GetLanguage"
+  /// | **FPS scale** | Video | Type related required | @ref InputstreamInfo::SetFpsScale "SetFpsScale" | @ref InputstreamInfo::GetFpsScale "GetFpsScale"
+  /// | **FPS rate** | Video | Type related required | @ref InputstreamInfo::SetFpsRate "SetFpsRate" | @ref InputstreamInfo::GetFpsRate "GetFpsRate"
+  /// | **Height** | Video | Type related required | @ref InputstreamInfo::SetHeight "SetHeight" | @ref InputstreamInfo::GetHeight "GetHeight"
+  /// | **Width** | Video | Type related required | @ref InputstreamInfo::SetWidth "SetWidth" | @ref InputstreamInfo::GetWidth "GetWidth"
+  /// | **Aspect** | Video | Type related required | @ref InputstreamInfo::SetAspect "SetAspect" | @ref InputstreamInfo::GetAspect "GetAspect"
+  /// | **Channel quantity** | Audio | Type related required | @ref InputstreamInfo::SetChannels "SetChannels" | @ref InputstreamInfo::GetChannels "GetChannels"
+  /// | **Sample rate** | Audio | Type related required | @ref InputstreamInfo::SetSampleRate "SetSampleRate" | @ref InputstreamInfo::GetSampleRate "GetSampleRate"
+  /// | **Bit rate** | Audio | Type related required | @ref InputstreamInfo::SetBitRate "SetBitRate" | @ref InputstreamInfo::GetBitRate "GetBitRate"
+  /// | **Bits per sample** | Audio | Type related required | @ref InputstreamInfo::SetBitsPerSample "SetBitsPerSample" | @ref InputstreamInfo::GetBitsPerSample "GetBitsPerSample"
+  /// | **Block align** |  | no | @ref InputstreamInfo::SetBlockAlign "SetBlockAlign" | @ref InputstreamInfo::GetBlockAlign "GetBlockAlign"
+  /// | **Crypto session info** |  | no | @ref InputstreamInfo::SetCryptoSession "SetCryptoSession" | @ref InputstreamInfo::GetCryptoSession "GetCryptoSession"
+  /// | **Four CC code** |  | no | @ref InputstreamInfo::SetCodecFourCC "SetCodecFourCC" | @ref InputstreamInfo::GetCodecFourCC "GetCodecFourCC"
+  /// | **Color space** |  | no | @ref InputstreamInfo::SetColorSpace "SetColorSpace" | @ref InputstreamInfo::GetColorSpace "GetColorSpace"
+  /// | **Color range** |  | no | @ref InputstreamInfo::SetColorRange "SetColorRange" | @ref InputstreamInfo::GetColorRange "GetColorRange"
+  /// | **Color primaries** |  | no | @ref InputstreamInfo::SetColorPrimaries "SetColorPrimaries" | @ref InputstreamInfo::GetColorPrimaries "GetColorPrimaries"
+  /// | **Color transfer characteristic** |  | no | @ref InputstreamInfo::SetColorTransferCharacteristic "SetColorTransferCharacteristic" | @ref InputstreamInfo::GetColorTransferCharacteristic "GetColorTransferCharacteristic"
+  /// | **Mastering metadata** |  | no | @ref InputstreamInfo::SetMasteringMetadata "SetMasteringMetadata" | @ref InputstreamInfo::GetMasteringMetadata "GetMasteringMetadata"
+  /// | **Content light metadata** |  | no | @ref InputstreamInfo::SetContentLightMetadata "SetContentLightMetadata" | @ref InputstreamInfo::GetContentLightMetadata "GetContentLightMetadata"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo
+  ///@{
+
+  /// @brief Set the wanted stream type.
+  ///
+  /// @param[in] streamType By @ref INPUTSTREAM_TYPE defined type
+  void SetStreamType(INPUTSTREAM_TYPE streamType) { m_cStructure->m_streamType = streamType; }
+
+  /// @brief To get with @ref SetStreamType changed values.
+  INPUTSTREAM_TYPE GetStreamType() const { return m_cStructure->m_streamType; }
+
+  /// @brief Set special supported feature flags of inputstream.
+  ///
+  /// @param[in] features By @ref INPUTSTREAM_CODEC_FEATURES defined type
+  void SetFeatures(uint32_t features) { m_cStructure->m_features = features; }
+
+  /// @brief To get with @ref SetFeatures changed values.
+  uint32_t GetFeatures() const { return m_cStructure->m_features; }
+
+  /// @brief Set supported flags of inputstream.
+  ///
+  /// @param[in] flags The on @ref INPUTSTREAM_FLAGS defined flags to set
+  void SetFlags(uint32_t flags) { m_cStructure->m_flags = flags; }
+
+  /// @brief To get with @ref SetFeatures changed values.
+  uint32_t GetFlags() const { return m_cStructure->m_flags; }
+
+  /// @brief (optional) Name of the stream, leave empty for default handling.
+  ///
+  /// @param[in] name Stream name
+  void SetName(const std::string& name)
+  {
+    strncpy(m_cStructure->m_name, name.c_str(), INPUTSTREAM_MAX_STRING_NAME_SIZE);
+  }
+
+  /// @brief To get with @ref SetName changed values.
+  std::string GetName() const { return m_cStructure->m_name; }
+
+  /// @brief (required) Name of codec according to ffmpeg.
+  ///
+  /// See https://github.com/FFmpeg/FFmpeg/blob/master/libavcodec/codec_desc.c about
+  /// available names.
+  ///
+  /// @remark On @ref INPUTSTREAM_TYPE_TELETEXT and @ref INPUTSTREAM_TYPE_RDS
+  /// this can be ignored and leaved empty.
+  ///
+  /// @param[in] codeName Codec name
+  void SetCodecName(const std::string& codecName)
+  {
+    strncpy(m_cStructure->m_codecName, codecName.c_str(), INPUTSTREAM_MAX_STRING_CODEC_SIZE);
+  }
+
+  /// @brief To get with @ref SetCodecName changed values.
+  std::string GetCodecName() const { return m_cStructure->m_codecName; }
+
+  /// @brief (optional) Internal name of codec (selectionstream info).
+  ///
+  /// @param[in] codecName Internal codec name
+  void SetCodecInternalName(const std::string& codecName)
+  {
+    strncpy(m_cStructure->m_codecInternalName, codecName.c_str(),
+            INPUTSTREAM_MAX_STRING_CODEC_SIZE);
+  }
+
+  /// @brief To get with @ref SetCodecInternalName changed values.
+  std::string GetCodecInternalName() const { return m_cStructure->m_codecInternalName; }
+
+  /// @brief (optional) The profile of the codec.
+  ///
+  /// @param[in] codecProfile Values with @ref STREAMCODEC_PROFILE to use
+  void SetCodecProfile(STREAMCODEC_PROFILE codecProfile)
+  {
+    m_cStructure->m_codecProfile = codecProfile;
+  }
+
+  /// @brief To get with @ref SetCodecProfile changed values.
+  STREAMCODEC_PROFILE GetCodecProfile() const { return m_cStructure->m_codecProfile; }
+
+  /// @brief (required) Physical index.
+  ///
+  /// @param[in] id Index identifier
+  void SetPhysicalIndex(unsigned int id) { m_cStructure->m_pID = id; }
+
+  /// @brief To get with @ref SetPhysicalIndex changed values.
+  unsigned int GetPhysicalIndex() const { return m_cStructure->m_pID; }
+
+  /// @brief Additional data where can needed on streams.
+  ///
+  /// @param[in] extraData List with memory of extra data
+  void SetExtraData(const std::vector<uint8_t>& extraData)
+  {
+    m_extraData = extraData;
+    m_cStructure->m_ExtraData = m_extraData.data();
+    m_cStructure->m_ExtraSize = m_extraData.size();
+  }
+
+  /// @brief Additional data where can needed on streams.
+  ///
+  /// @param[in] extraData Pointer with memory of extra data
+  /// @param[in] extraSize Size to store
+  void SetExtraData(const uint8_t* extraData, size_t extraSize)
+  {
+    m_extraData.clear();
+    if (extraData && extraSize > 0)
     {
-      COLORRANGE_UNKNOWN = 0,
-      COLORRANGE_LIMITED,
-      COLORRANGE_FULLRANGE,
-      COLORRANGE_MAX
-    };
-
-    // keep in sync with AVColorTransferCharacteristic
-    enum COLORTRC : int32_t
+      for (size_t i = 0; i < extraSize; ++i)
+        m_extraData.emplace_back(extraData[i]);
+    }
+
+    m_cStructure->m_ExtraData = m_extraData.data();
+    m_cStructure->m_ExtraSize = m_extraData.size();
+  }
+
+  /// @brief To get with @ref SetExtraData changed values.
+  const std::vector<uint8_t>& GetExtraData() { return m_extraData; }
+
+  /// @brief To get size with @ref SetExtraData changed values.
+  size_t GetExtraDataSize() { return m_extraData.size(); }
+
+  /// @brief Compare extra data from outside with class
+  ///
+  /// @param[in] extraData Pointer with memory of extra data for compare
+  /// @param[in] extraSize Size to compare
+  /// @return true if they equal, false otherwise
+  bool CompareExtraData(const uint8_t* extraData, size_t extraSize) const
+  {
+    if (!extraData || m_extraData.size() != extraSize)
+      return false;
+    for (size_t i = 0; i < extraSize; ++i)
     {
-      COLORTRC_RESERVED0 = 0,
-      COLORTRC_BT709 = 1,
-      COLORTRC_UNSPECIFIED = 2,
-      COLORTRC_RESERVED = 3,
-      COLORTRC_GAMMA22 = 4,
-      COLORTRC_GAMMA28 = 5,
-      COLORTRC_SMPTE170M = 6,
-      COLORTRC_SMPTE240M = 7,
-      COLORTRC_LINEAR = 8,
-      COLORTRC_LOG = 9,
-      COLORTRC_LOG_SQRT = 10,
-      COLORTRC_IEC61966_2_4 = 11,
-      COLORTRC_BT1361_ECG = 12,
-      COLORTRC_IEC61966_2_1 = 13,
-      COLORTRC_BT2020_10 = 14,
-      COLORTRC_BT2020_12 = 15,
-      COLORTRC_SMPTE2084 = 16,
-      COLORTRC_SMPTEST2084 = COLORTRC_SMPTE2084,
-      COLORTRC_SMPTE428 = 17,
-      COLORTRC_SMPTEST428_1 = COLORTRC_SMPTE428,
-      COLORTRC_ARIB_STD_B67 = 18,
-      COLORTRC_MAX
-    };
+      if (m_extraData[i] != extraData[i])
+        return false;
+    }
+    return true;
+  }
 
-    uint32_t m_flags;
+  /// @brief Clear additional data.
+  void ClearExtraData()
+  {
+    m_extraData.clear();
+    m_cStructure->m_ExtraData = m_extraData.data();
+    m_cStructure->m_ExtraSize = m_extraData.size();
+  }
 
-    //! @brief (optional) name of the stream, \0 for default handling
-    char m_name[INPUTSTREAM_MAX_STRING_NAME_SIZE];
+  /// @brief RFC 5646 language code (empty string if undefined).
+  ///
+  /// @param[in] language The language to set
+  void SetLanguage(const std::string& language)
+  {
+    strncpy(m_cStructure->m_language, language.c_str(), INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE);
+  }
 
-    //! @brief (required) name of codec according to ffmpeg
-    char m_codecName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+  /// @brief To get with @ref SetLanguage changed values.
+  std::string GetLanguage() const { return m_cStructure->m_language; }
 
-    //! @brief (optional) internal name of codec (selectionstream info)
-    char m_codecInternalName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+  /// @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps.
+  ///
+  /// @param[in] fpsScale Scale rate
+  void SetFpsScale(unsigned int fpsScale) { m_cStructure->m_FpsScale = fpsScale; }
 
-    //! @brief (optional) the profile of the codec
-    STREAMCODEC_PROFILE m_codecProfile;
+  /// @brief To get with @ref SetFpsScale changed values.
+  unsigned int GetFpsScale() const { return m_cStructure->m_FpsScale; }
 
-    //! @brief (required) physical index
-    unsigned int m_pID;
+  /// @brief Rate to use for stream.
+  ///
+  /// @param[in] fpsRate Rate to use
+  void SetFpsRate(unsigned int fpsRate) { m_cStructure->m_FpsRate = fpsRate; }
 
-    const uint8_t* m_ExtraData;
-    unsigned int m_ExtraSize;
+  /// @brief To get with @ref SetFpsRate changed values.
+  unsigned int GetFpsRate() const { return m_cStructure->m_FpsRate; }
 
-    //! @brief RFC 5646 language code (empty string if undefined)
-    char m_language[INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE];
+  /// @brief Height of the stream reported by the demuxer.
+  ///
+  /// @param[in] height Height to use
+  void SetHeight(unsigned int height) { m_cStructure->m_Height = height; }
 
-    //! Video stream related data
-    //@{
+  /// @brief To get with @ref SetHeight changed values.
+  unsigned int GetHeight() const { return m_cStructure->m_Height; }
 
-    //! @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps
-    unsigned int m_FpsScale;
+  /// @brief Width of the stream reported by the demuxer.
+  ///
+  /// @param[in] width Width to use
+  void SetWidth(unsigned int width) { m_cStructure->m_Width = width; }
 
-    unsigned int m_FpsRate;
+  /// @brief To get with @ref SetWidth changed values.
+  unsigned int GetWidth() const { return m_cStructure->m_Width; }
 
-    //! @brief height of the stream reported by the demuxer
-    unsigned int m_Height;
+  /// @brief Display aspect of stream.
+  ///
+  /// @param[in] aspect Aspect ratio to use
+  void SetAspect(float aspect) { m_cStructure->m_Aspect = aspect; }
 
-    //! @brief width of the stream reported by the demuxer
-    unsigned int m_Width;
+  /// @brief To get with @ref SetAspect changed values.
+  float GetAspect() const { return m_cStructure->m_Aspect; }
 
-    //! @brief display aspect of stream
-    float m_Aspect;
-
-    //@}
-
-    //! Audio stream related data
-    //@{
-
-    //! @brief (required) amount of channels
-    unsigned int m_Channels;
-
-    //! @brief (required) sample rate
-    unsigned int m_SampleRate;
-
-    //! @brief (required) bit rate
-    unsigned int m_BitRate;
-
-    //! @brief (required) bits per sample
-    unsigned int m_BitsPerSample;
-
-    unsigned int m_BlockAlign;
-
-    //@}
-
-    CRYPTO_INFO m_cryptoInfo;
-
-    // new in API version 2.0.8
-    //@{
-    //! @brief Codec If available, the fourcc code codec
-    unsigned int m_codecFourCC;
-
-    //! @brief definition of colorspace
-    COLORSPACE m_colorSpace;
-
-    //! @brief color range if available
-    COLORRANGE m_colorRange;
-    //@}
-
-    //new in API 2.0.9 / INPUTSTREAM_VERSION_LEVEL 1
-    //@{
-    COLORPRIMARIES m_colorPrimaries;
-    COLORTRC m_colorTransferCharacteristic;
-    //@}
-
-    //! @brief mastering static Metadata
-    INPUTSTREAM_MASTERING_METADATA* m_masteringMetadata;
-
-    //! @brief content light static Metadata
-    INPUTSTREAM_CONTENTLIGHT_METADATA* m_contentLightMetadata;
-  };
+  /// @brief (required) Amount of channels.
+  ///
+  /// @param[in] sampleRate Channels to use
+  void SetChannels(unsigned int channels) { m_cStructure->m_Channels = channels; }
 
-  struct INPUTSTREAM_TIMES
-  {
-    time_t startTime;
-    double ptsStart;
-    double ptsBegin;
-    double ptsEnd;
-  };
+  /// @brief To get with @ref SetChannels changed values.
+  unsigned int GetChannels() const { return m_cStructure->m_Channels; }
 
-  /*!
-   * @brief "C" ABI Structures to transfer the methods from this to Kodi
-   */
+  /// @brief (required) Sample rate.
+  ///
+  /// @param[in] sampleRate Rate to use
+  void SetSampleRate(unsigned int sampleRate) { m_cStructure->m_SampleRate = sampleRate; }
 
-  // this are properties given to the addon on create
-  // at this time we have no parameters for the addon
-  typedef struct AddonProps_InputStream /* internal */
+  /// @brief To get with @ref SetSampleRate changed values.
+  unsigned int GetSampleRate() const { return m_cStructure->m_SampleRate; }
+
+  /// @brief Bit rate.
+  ///
+  /// @param[in] bitRate Rate to use
+  void SetBitRate(unsigned int bitRate) { m_cStructure->m_BitRate = bitRate; }
+
+  /// @brief To get with @ref SetBitRate changed values.
+  unsigned int GetBitRate() const { return m_cStructure->m_BitRate; }
+
+  /// @brief (required) Bits per sample.
+  ///
+  /// @param[in] bitsPerSample Bits per sample to use
+  void SetBitsPerSample(unsigned int bitsPerSample)
   {
-    int dummy;
-  } AddonProps_InputStream;
+    m_cStructure->m_BitsPerSample = bitsPerSample;
+  }
+
+  /// @brief To get with @ref SetBitsPerSample changed values.
+  unsigned int GetBitsPerSample() const { return m_cStructure->m_BitsPerSample; }
+
+  /// @brief To set the necessary stream block alignment size.
+  ///
+  /// @param[in] blockAlign Block size in byte
+  void SetBlockAlign(unsigned int blockAlign) { m_cStructure->m_BlockAlign = blockAlign; }
+
+  /// @brief To get with @ref SetBlockAlign changed values.
+  unsigned int GetBlockAlign() const { return m_cStructure->m_BlockAlign; }
 
-  typedef struct AddonToKodiFuncTable_InputStream /* internal */
+  /// @brief To set stream crypto session informations.
+  ///
+  /// @param[in] cryptoSession The with @ref cpp_kodi_addon_inputstream_Defs_Interface_StreamCryptoSession setable info
+  ///
+  void SetCryptoSession(const kodi::addon::StreamCryptoSession& cryptoSession)
   {
-    KODI_HANDLE kodiInstance;
-    DemuxPacket* (*allocate_demux_packet)(void* kodiInstance, int data_size);
-    DemuxPacket* (*allocate_encrypted_demux_packet)(void* kodiInstance,
-                                                    unsigned int data_size,
-                                                    unsigned int encrypted_subsample_count);
-    void (*free_demux_packet)(void* kodiInstance, DemuxPacket* packet);
-  } AddonToKodiFuncTable_InputStream;
+    m_cryptoSession = cryptoSession;
+    memcpy(&m_cStructure->m_cryptoSession, m_cryptoSession.GetCStructure(),
+           sizeof(STREAM_CRYPTO_SESSION));
+  }
+
+  /// @brief To get with @ref GetCryptoSession changed values.
+  const kodi::addon::StreamCryptoSession& GetCryptoSession() const { return m_cryptoSession; }
+
+  /// @brief Codec If available, the fourcc code codec.
+  ///
+  /// @param[in] codecFourCC Codec four CC code
+  void SetCodecFourCC(unsigned int codecFourCC) { m_cStructure->m_codecFourCC = codecFourCC; }
+
+  /// @brief To get with @ref SetCodecFourCC changed values
+  unsigned int GetCodecFourCC() const { return m_cStructure->m_codecFourCC; }
+
+  /// @brief Definition of colorspace.
+  ///
+  /// @param[in] colorSpace The with @ref INPUTSTREAM_COLORSPACE setable color space
+  void SetColorSpace(INPUTSTREAM_COLORSPACE colorSpace) { m_cStructure->m_colorSpace = colorSpace; }
+
+  /// @brief To get with @ref SetColorSpace changed values.
+  INPUTSTREAM_COLORSPACE GetColorSpace() const { return m_cStructure->m_colorSpace; }
+
+  /// @brief Color range if available.
+  ///
+  /// @param[in] colorRange The with @ref INPUTSTREAM_COLORRANGE setable color space
+  void SetColorRange(INPUTSTREAM_COLORRANGE colorRange) { m_cStructure->m_colorRange = colorRange; }
 
-  struct AddonInstance_InputStream;
-  typedef struct KodiToAddonFuncTable_InputStream /* internal */
+  /// @brief To get with @ref SetColorRange changed values.
+  INPUTSTREAM_COLORRANGE GetColorRange() const { return m_cStructure->m_colorRange; }
+
+  /// @brief Chromaticity coordinates of the source primaries. These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
+  ///
+  /// @param[in] colorPrimaries The with @ref INPUTSTREAM_COLORPRIMARIES setable values
+  void SetColorPrimaries(INPUTSTREAM_COLORPRIMARIES colorPrimaries)
   {
-    KODI_HANDLE addonInstance;
+    m_cStructure->m_colorPrimaries = colorPrimaries;
+  }
 
-    bool(__cdecl* open)(const AddonInstance_InputStream* instance, INPUTSTREAM* props);
-    void(__cdecl* close)(const AddonInstance_InputStream* instance);
-    const char*(__cdecl* get_path_list)(const AddonInstance_InputStream* instance);
-    void(__cdecl* get_capabilities)(const AddonInstance_InputStream* instance,
-                                    INPUTSTREAM_CAPABILITIES* capabilities);
+  /// @brief To get with @ref SetColorPrimaries changed values.
+  INPUTSTREAM_COLORPRIMARIES GetColorPrimaries() const { return m_cStructure->m_colorPrimaries; }
 
-    // IDemux
-    struct INPUTSTREAM_IDS(__cdecl* get_stream_ids)(const AddonInstance_InputStream* instance);
-    struct INPUTSTREAM_INFO(__cdecl* get_stream)(const AddonInstance_InputStream* instance,
-                                                 int streamid);
-    void(__cdecl* enable_stream)(const AddonInstance_InputStream* instance,
-                                 int streamid,
-                                 bool enable);
-    bool(__cdecl* open_stream)(const AddonInstance_InputStream* instance, int streamid);
-    void(__cdecl* demux_reset)(const AddonInstance_InputStream* instance);
-    void(__cdecl* demux_abort)(const AddonInstance_InputStream* instance);
-    void(__cdecl* demux_flush)(const AddonInstance_InputStream* instance);
-    DemuxPacket*(__cdecl* demux_read)(const AddonInstance_InputStream* instance);
-    bool(__cdecl* demux_seek_time)(const AddonInstance_InputStream* instance,
-                                   double time,
-                                   bool backwards,
-                                   double* startpts);
-    void(__cdecl* demux_set_speed)(const AddonInstance_InputStream* instance, int speed);
-    void(__cdecl* set_video_resolution)(const AddonInstance_InputStream* instance,
-                                        int width,
-                                        int height);
-
-    // IDisplayTime
-    int(__cdecl* get_total_time)(const AddonInstance_InputStream* instance);
-    int(__cdecl* get_time)(const AddonInstance_InputStream* instance);
-
-    // ITime
-    bool(__cdecl* get_times)(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES* times);
-
-    // IPosTime
-    bool(__cdecl* pos_time)(const AddonInstance_InputStream* instance, int ms);
-
-    int(__cdecl* read_stream)(const AddonInstance_InputStream* instance,
-                              uint8_t* buffer,
-                              unsigned int bufferSize);
-    int64_t(__cdecl* seek_stream)(const AddonInstance_InputStream* instance,
-                                  int64_t position,
-                                  int whence);
-    int64_t(__cdecl* position_stream)(const AddonInstance_InputStream* instance);
-    int64_t(__cdecl* length_stream)(const AddonInstance_InputStream* instance);
-    bool(__cdecl* is_real_time_stream)(const AddonInstance_InputStream* instance);
-
-    // IChapter
-    int(__cdecl* get_chapter)(const AddonInstance_InputStream* instance);
-    int(__cdecl* get_chapter_count)(const AddonInstance_InputStream* instance);
-    const char*(__cdecl* get_chapter_name)(const AddonInstance_InputStream* instance, int ch);
-    int64_t(__cdecl* get_chapter_pos)(const AddonInstance_InputStream* instance, int ch);
-    bool(__cdecl* seek_chapter)(const AddonInstance_InputStream* instance, int ch);
-
-    int(__cdecl* block_size_stream)(const AddonInstance_InputStream* instance);
-  } KodiToAddonFuncTable_InputStream;
-
-  typedef struct AddonInstance_InputStream /* internal */
-  {
-    AddonProps_InputStream* props;
-    AddonToKodiFuncTable_InputStream* toKodi;
-    KodiToAddonFuncTable_InputStream* toAddon;
-  } AddonInstance_InputStream;
+  /// @brief Color Transfer Characteristic. These values match the ones defined by ISO/IEC 23001-8_2013 § 7.2.
+  ///
+  /// @param[in] colorTransferCharacteristic The with @ref INPUTSTREAM_COLORTRC setable characteristic
+  void SetColorTransferCharacteristic(INPUTSTREAM_COLORTRC colorTransferCharacteristic)
+  {
+    m_cStructure->m_colorTransferCharacteristic = colorTransferCharacteristic;
+  }
 
-#ifdef __cplusplus
-} /* extern "C" */
+  /// @brief To get with @ref SetColorTransferCharacteristic changed values.
+  INPUTSTREAM_COLORTRC GetColorTransferCharacteristic() const
+  {
+    return m_cStructure->m_colorTransferCharacteristic;
+  }
 
-namespace kodi
-{
-namespace addon
-{
+  /// @brief Mastering static Metadata.
+  ///
+  /// Describes the metadata for HDR10, used when video is compressed using High
+  /// Efficiency Video Coding (HEVC). This is used to describe the capabilities
+  /// of the display used to master the content and the luminance values of the
+  /// content.
+  ///
+  /// @param[in] masteringMetadata The with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamMasteringMetadata setable metadata
+  void SetMasteringMetadata(const kodi::addon::InputstreamMasteringMetadata& masteringMetadata)
+  {
+    m_masteringMetadata = masteringMetadata;
+    m_cStructure->m_masteringMetadata = m_masteringMetadata;
+  }
 
-class ATTRIBUTE_HIDDEN CInstanceInputStream : public IAddonInstance
-{
-public:
-  explicit CInstanceInputStream(KODI_HANDLE instance, const std::string& kodiVersion = "")
-    : IAddonInstance(ADDON_INSTANCE_INPUTSTREAM,
-                     !kodiVersion.empty() ? kodiVersion
-                                          : GetKodiTypeVersion(ADDON_INSTANCE_INPUTSTREAM))
+  /// @brief To get with @ref SetMasteringMetadata changed values.
+  const kodi::addon::InputstreamMasteringMetadata& GetMasteringMetadata() const
   {
-    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-      throw std::logic_error("kodi::addon::CInstanceInputStream: Creation of multiple together "
-                             "with single instance way is not allowed!");
+    return m_masteringMetadata;
+  }
 
-    SetAddonStruct(instance, m_kodiVersion);
+  /// @brief Clear mastering static Metadata.
+  void ClearMasteringMetadata() { m_cStructure->m_masteringMetadata = nullptr; }
+
+  /// @brief Content light static Metadata.
+  ///
+  /// The maximum content light level (MaxCLL) and frame average light level
+  /// (MaxFALL) for the metadata for HDR10.
+  ///
+  /// @param[in] contentLightMetadata The with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamContentlightMetadata setable metadata
+  void SetContentLightMetadata(
+      const kodi::addon::InputstreamContentlightMetadata& contentLightMetadata)
+  {
+    m_contentLightMetadata = contentLightMetadata;
+    m_cStructure->m_contentLightMetadata = m_contentLightMetadata;
   }
 
-  ~CInstanceInputStream() override = default;
+  /// @brief To get with @ref SetContentLightMetadata changed values.
+  const kodi::addon::InputstreamContentlightMetadata& GetContentLightMetadata() const
+  {
+    return m_contentLightMetadata;
+  }
 
-  /*!
-     * Open a stream.
-     * @param props
-     * @return True if the stream has been opened successfully, false otherwise.
-     * @remarks
-     */
-  virtual bool Open(INPUTSTREAM& props) = 0;
-
-  /*!
-     * Close an open stream.
-     * @remarks
-     */
-  virtual void Close() = 0;
+  /// @brief Clear content light static Metadata.
+  void ClearContentLightMetadata() { m_cStructure->m_contentLightMetadata = nullptr; }
 
-  /*!
-     * Get Capabilities of this addon.
-     * @param capabilities The add-on's capabilities.
-     * @remarks
-     */
-  virtual void GetCapabilities(INPUTSTREAM_CAPABILITIES& capabilities) = 0;
-
-  /*!
-     * Get IDs of available streams
-     * @remarks
-     */
-  virtual INPUTSTREAM_IDS GetStreamIds() = 0;
-
-  /*!
-     * Get stream properties of a stream.
-     * @param streamid unique id of stream
-     * @return struc of stream properties
-     * @remarks
-     */
-  virtual INPUTSTREAM_INFO GetStream(int streamid) = 0;
-
-  /*!
-     * Enable or disable a stream.
-     * A disabled stream does not send demux packets
-     * @param streamid unique id of stream
-     * @param enable true for enable, false for disable
-     * @remarks
-     */
-  virtual void EnableStream(int streamid, bool enable) = 0;
-
-  /*!
-    * Opens a stream for playback.
-    * @param streamid unique id of stream
-    * @remarks
-    */
-  virtual bool OpenStream(int streamid) = 0;
+  ///@}
 
-  /*!
-     * Reset the demultiplexer in the add-on.
-     * @remarks Required if bHandlesDemuxing is set to true.
-     */
-  virtual void DemuxReset() {}
+private:
+  InputstreamInfo(const INPUTSTREAM_INFO* stream) : CStructHdl(stream)
+  {
+    SetCryptoSession(StreamCryptoSession(&stream->m_cryptoSession));
+    CopyExtraData();
+  }
+  InputstreamInfo(INPUTSTREAM_INFO* stream) : CStructHdl(stream)
+  {
+    SetCryptoSession(StreamCryptoSession(&stream->m_cryptoSession));
+    CopyExtraData();
+  }
 
-  /*!
-     * Abort the demultiplexer thread in the add-on.
-     * @remarks Required if bHandlesDemuxing is set to true.
-     */
-  virtual void DemuxAbort() {}
+  void CopyExtraData()
+  {
+    if (m_cStructure->m_ExtraData && m_cStructure->m_ExtraSize > 0)
+    {
+      for (unsigned int i = 0; i < m_cStructure->m_ExtraSize; ++i)
+        m_extraData.emplace_back(m_cStructure->m_ExtraData[i]);
+    }
+    if (m_cStructure->m_masteringMetadata)
+      m_masteringMetadata = m_cStructure->m_masteringMetadata;
+    if (m_cStructure->m_contentLightMetadata)
+      m_contentLightMetadata = m_cStructure->m_contentLightMetadata;
+  }
+  std::vector<uint8_t> m_extraData;
+  StreamCryptoSession m_cryptoSession;
+  InputstreamMasteringMetadata m_masteringMetadata;
+  InputstreamContentlightMetadata m_contentLightMetadata;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes class InputstreamTimes
+/// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+/// @brief **Inputstream add-on times**\n
+/// Used on @ref kodi::addon::CInstanceInputStream::GetTimes().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN InputstreamTimes : public CStructHdl<InputstreamTimes, INPUTSTREAM_TIMES>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  /*! \endcond */
 
-  /*!
-     * Flush all data that's currently in the demultiplexer buffer in the add-on.
-     * @remarks Required if bHandlesDemuxing is set to true.
-     */
-  virtual void DemuxFlush() {}
+public:
+  /*! \cond PRIVATE */
+  InputstreamTimes() = default;
+  InputstreamTimes(const InputstreamTimes& stream) : CStructHdl(stream) {}
+  /*! \endcond */
 
-  /*!
-     * Read the next packet from the demultiplexer, if there is one.
-     * @return The next packet.
-     *         If there is no next packet, then the add-on should return the
-     *         packet created by calling AllocateDemuxPacket(0) on the callback.
-     *         If the stream changed and Kodi's player needs to be reinitialised,
-     *         then, the add-on should call AllocateDemuxPacket(0) on the
-     *         callback, and set the streamid to DMX_SPECIALID_STREAMCHANGE and
-     *         return the value.
-     *         The add-on should return NULL if an error occurred.
-     * @remarks Return NULL if this add-on won't provide this function.
-     */
-  virtual DemuxPacket* DemuxRead() { return nullptr; }
-
-  /*!
-     * Notify the InputStream addon/demuxer that Kodi wishes to seek the stream by time
-     * Demuxer is required to set stream to an IDR frame
-     * @param time The absolute time since stream start
-     * @param backwards True to seek to keyframe BEFORE time, else AFTER
-     * @param startpts can be updated to point to where display should start
-     * @return True if the seek operation was possible
-     * @remarks Optional, and only used if addon has its own demuxer.
-     */
-  virtual bool DemuxSeekTime(double time, bool backwards, double& startpts) { return false; }
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|--------------------
+  /// | **Start time** | `time_t` | @ref InputstreamTimes::SetStartTime "SetStartTime" | @ref InputstreamTimes::GetStartTime "GetStartTime"
+  /// | **PTS start** | `double` | @ref InputstreamTimes::SetPtsStart "SetPtsStart" | @ref InputstreamTimes::GetPtsStart "GetPtsStart"
+  /// | **PTS begin** | `double` | @ref InputstreamTimes::SetPtsBegin "SetPtsBegin" | @ref InputstreamTimes::GetPtsBegin "GetPtsBegin"
+  /// | **PTS end** | `double` | @ref InputstreamTimes::SetPtsEnd "SetPtsEnd" | @ref InputstreamTimes::GetPtsEnd "GetPtsEnd"
+  ///
 
-  /*!
-     * Notify the InputStream addon/demuxer that Kodi wishes to change playback speed
-     * @param speed The requested playback speed
-     * @remarks Optional, and only used if addon has its own demuxer.
-     */
-  virtual void DemuxSetSpeed(int speed) {}
+  /// @addtogroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamTimes
+  ///@{
 
-  /*!
-     * Sets desired width / height
-     * @param width / hight
-     */
-  virtual void SetVideoResolution(int width, int height) {}
+  /// @brief Start time in milliseconds
+  void SetStartTime(time_t startTime) const { m_cStructure->startTime = startTime; }
 
-  /*!
-     * Totel time in ms
-     * @remarks
-     */
-  virtual int GetTotalTime() { return -1; }
+  /// @brief To get with @ref SetStartTime changed values
+  time_t GetStartTime() const { return m_cStructure->startTime; }
 
-  /*!
-     * Playing time in ms
-     * @remarks
-     */
-  virtual int GetTime() { return -1; }
+  /// @brief Start PTS
+  void SetPtsStart(double ptsStart) const { m_cStructure->ptsStart = ptsStart; }
 
-  /*!
-    * Get current timing values in PTS scale
-    * @remarks
-    */
-  virtual bool GetTimes(INPUTSTREAM_TIMES& times) { return false; }
+  /// @brief To get with @ref SetPtsStart changed values
+  double GetPtsStart() const { return m_cStructure->ptsStart; }
 
-  /*!
-     * Positions inputstream to playing time given in ms
-     * @remarks
-     */
-  virtual bool PosTime(int ms) { return false; }
+  /// @brief Begin PTS
+  void SetPtsBegin(double ptsBegin) const { m_cStructure->ptsBegin = ptsBegin; }
 
-  /*!
-  * Return currently selected chapter
-  * @remarks
-  */
-  virtual int GetChapter() { return -1; };
+  /// @brief To get with @ref SetPtsBegin changed values
+  double GetPtsBegin() const { return m_cStructure->ptsBegin; }
 
-  /*!
-  * Return number of available chapters
-  * @remarks
-  */
-  virtual int GetChapterCount() { return 0; };
+  /// @brief End PTS
+  void SetPtsEnd(double ptsEnd) const { m_cStructure->ptsEnd = ptsEnd; }
 
-  /*!
-  * Return name of chapter # ch
-  * @remarks
-  */
-  virtual const char* GetChapterName(int ch) { return nullptr; };
+  /// @brief To get with @ref SetPtsEnd changed values
+  double GetPtsEnd() const { return m_cStructure->ptsEnd; }
 
-  /*!
-  * Return position if chapter # ch in milliseconds
-  * @remarks
-  */
-  virtual int64_t GetChapterPos(int ch) { return 0; };
+  ///@}
 
-  /*!
-  * Seek to the beginning of chapter # ch
-  * @remarks
-  */
-  virtual bool SeekChapter(int ch) { return false; };
+private:
+  InputstreamTimes(const INPUTSTREAM_TIMES* stream) : CStructHdl(stream) {}
+  InputstreamTimes(INPUTSTREAM_TIMES* stream) : CStructHdl(stream) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//============================================================================
+///
+/// @addtogroup cpp_kodi_addon_inputstream
+/// @brief \cpp_class{ kodi::addon::CInstanceInputStream }
+/// **Inputstream add-on instance**
+///
+/// This instance type is for using input streams to video and audio, to process
+/// and then give them to Kodi.
+///
+/// This usage can be requested under various conditions, for example explicitly
+/// by another addon, by a Mimetype protocol defined in `addon.xml` or supported
+/// file extensions.
+///
+/// In addition, stream files (* .strm) can be linked to an inputstream addon
+/// using <b>`#KODIPROP:inputstream=<ADDON_NAME>`</b>.
+///
+/// Include the header @ref Inputstream.h "#include <kodi/addon-instance/Inputstream.h>"
+/// to use this class.
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an inputstream addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="inputstream.myspecialnamefor"
+///   version="1.0.0"
+///   name="My InputStream addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.inputstream"
+///     extension=".xyz|.zyx"
+///     listitemprops="license_type|license_key|license_data|license_flags"
+///     protocols="myspecialnamefor|myspecialnamefors"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My InputStream addon</summary>
+///     <description lang="en_GB">My InputStream description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+///
+/// At <b>`<extension point="kodi.inputstream" ...>`</b> the basic instance definition is declared, this is intended to identify the addon as an input stream and to see its supported types:
+/// | Name | Description
+/// |------|----------------------
+/// | <b>`point`</b> | The identification of the addon instance to inputstream is mandatory <b>`kodi.inputstream`</b>. In addition, the instance declared in the first <b>`<extension ... />`</b> is also
+/// | <b>`extension`</b> | A filename extension is an identifier specified as a suffix to the name of a computer file where supported by addon.
+/// | <b>`listitemprops`</b> | Values that are available to the addon at @ref InputstreamProperty::GetProperties() and that can be passed to @ref CInstanceInputStream::Open() ith the respective values.
+/// | <b>`protocols`</b> | The streaming protocol is a special protocol supported by the addon for the transmission of streaming media data over a network.
+/// | <b>`library_@PLATFORM@`</b> | The runtime library used for the addon. This is usually declared by cmake and correctly displayed in the translated `addon.xml`.
+///
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Example:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Inputstream.h>
+///
+/// class CMyInputstream : public kodi::addon::CInstanceInputStream
+/// {
+/// public:
+///   CMyInputstream(KODI_HANDLE instance, const std::string& kodiVersion);
+///
+///   void GetCapabilities(kodi::addon::InputstreamCapabilities& capabilities) override;
+///   bool Open(const kodi::addon::InputstreamProperty& props) override;
+///   void Close() override;
+///   ...
+/// };
+///
+/// CMyInputstream::CMyInputstream(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : kodi::addon::CInstanceInputStream(instance, kodiVersion)
+/// {
+///   ...
+/// }
+///
+/// void CMyInputstream::GetCapabilities(kodi::addon::InputstreamCapabilities& capabilities)
+/// {
+///   capabilities.SetMask(INPUTSTREAM_SUPPORTS_IDEMUX | INPUTSTREAM_SUPPORTS_PAUSE);
+/// }
+///
+/// void CMyInputstream::Open(const kodi::addon::InputstreamProperty& props)
+/// {
+///   std::string url = props.GetURL();
+///   ...
+/// }
+///
+/// void CMyInputstream::Close()
+/// {
+///   ...
+/// }
+///
+/// ...
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               std::string instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       std::string instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_INPUTSTREAM)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Inputstream");
+///     addonInstance = new CMyInputstream(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyInputstream` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+//------------------------------------------------------------------------------
+class ATTRIBUTE_HIDDEN CInstanceInputStream : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Inputstream class constructor used to support multiple instance
+  /// types
+  ///
+  /// @param[in] instance The instance value given to <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @warning Only use `instance` from the @ref CAddonBase::CreateInstance call.
+  ///
+  explicit CInstanceInputStream(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_INPUTSTREAM,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_INPUTSTREAM))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceInputStream: Creation of multiple together "
+                             "with single instance way is not allowed!");
 
-  /*!
-     * Read from an open stream.
-     * @param buffer The buffer to store the data in.
-     * @param bufferSize The amount of bytes to read.
-     * @return The amount of bytes that were actually read from the stream.
-     * @remarks Return -1 if this add-on won't provide this function.
-     */
-  virtual int ReadStream(uint8_t* buffer, unsigned int bufferSize) { return -1; }
+    SetAddonStruct(instance, m_kodiVersion);
+  }
+  //----------------------------------------------------------------------------
 
-  /*!
-     * Seek in a stream.
-     * @param position The position to seek to.
-     * @param whence ?
-     * @return The new position.
-     * @remarks Return -1 if this add-on won't provide this function.
-     */
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Destructor
+  ///
+  ~CInstanceInputStream() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Get the list of features that this add-on provides.
+  ///
+  /// Called by Kodi to query the add-on's capabilities.
+  /// Used to check which options should be presented in the UI, which methods to call, etc.
+  /// All capabilities that the add-on supports should be set to true.
+  ///
+  /// @param[out] capabilities The with @ref cpp_kodi_addon_inputstream_Defs_Capabilities defined add-on's capabilities.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities_Help
+  ///
+  /// --------------------------------------------------------------------------
+  /// @note Valid implementation required.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// void CMyInputstream::GetCapabilities(kodi::addon::InputstreamCapabilities& capabilities)
+  /// {
+  ///   capabilities.SetMask(INPUTSTREAM_SUPPORTS_IDEMUX | INPUTSTREAM_SUPPORTS_PAUSE);
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual void GetCapabilities(kodi::addon::InputstreamCapabilities& capabilities) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Open a stream.
+  ///
+  /// @param[in] props The used properties about the stream
+  /// @return True if the stream has been opened successfully, false otherwise.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_inputstream_Defs_InputstreamProperty_Help
+  ///
+  /// --------------------------------------------------------------------------
+  /// @note Valid implementation required.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// void CMyInputstream::Open(const kodi::addon::InputstreamProperty& props)
+  /// {
+  ///   std::string url = props.GetURL();
+  ///   std::string license_key = props.GetProperties()["inputstream.myspecialnamefor.license_key"];
+  ///   ...
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual bool Open(const kodi::addon::InputstreamProperty& props) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Close an open stream.
+  ///
+  /// @remarks
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// @note Valid implementation required.
+  ///
+  virtual void Close() = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream
+  /// @brief Check for real-time streaming
+  ///
+  /// @return true if current stream is real-time
+  ///
+  virtual bool IsRealTimeStream() { return true; }
+  //----------------------------------------------------------------------------
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_Read 1. Stream read
+  /// @brief **Functions required to read streams direct and demux inside Kodi.**
+  ///
+  /// This part contains at least the functions necessary for addon that have to
+  /// be supported. This can only be ignored if you use your own demux.
+  ///
+  /// The data loaded by Kodi is then processed in it itself. The source does not
+  /// matter, only Kodi must be able to process this stream data itself and is
+  /// therefore limited in some things.
+  ///
+  /// For more complex things, the addon must integrate its own demuxer and,
+  /// if necessary, even its own codec processing (see @ref cpp_kodi_addon_codec "Codec").
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_IDEMUX
+  /// is <em><b>undefined</b></em> in the capabilities (see @ref GetCapabilities()).
+  /// Otherwise becomes @ref cpp_kodi_addon_inputstream_Demux "demuxing" used.
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //============================================================================
+  /// @brief Read from an open stream.
+  ///
+  /// @param[in] buffer The buffer to store the data in.
+  /// @param[in] bufferSize The amount of bytes to read.
+  /// @return The amount of bytes that were actually read from the stream.
+  ///
+  virtual int ReadStream(uint8_t* buffer, unsigned int bufferSize) { return -1; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Seek in a stream.
+  ///
+  /// @param[in] position The position to seek to
+  /// @param[in] whence offset relative to<br>
+  /// You can set the value of whence to one of three things:
+  /// |     Value    |  int  | Description                                         |
+  /// |:------------:|:-----:|:----------------------------------------------------|
+  /// | **SEEK_SET** |  `0`  | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
+  /// | **SEEK_CUR** |  `1`  | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
+  /// | **SEEK_END** |  `2`  | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
+  ///
+  /// @return Returns the resulting offset location as measured in bytes from
+  /// the beginning of the file. On error, the value -1 is returned.
+  ///
+  /// @remarks Optional and can leaved away or return -1 if this add-on won't
+  /// provide this function.
+  ///
   virtual int64_t SeekStream(int64_t position, int whence = SEEK_SET) { return -1; }
-
-  /*!
-     * @return The position in the stream that's currently being read.
-     * @remarks Return -1 if this add-on won't provide this function.
-     */
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief The position in the stream that's currently being read.
+  ///
+  /// @return Stream position
+  ///
+  /// @remarks Optional and can leaved away or return -1 if this add-on won't
+  /// provide this function.
+  ///
   virtual int64_t PositionStream() { return -1; }
-
-  /*!
-     * @return The total length of the stream that's currently being read.
-     * @remarks Return -1 if this add-on won't provide this function.
-     */
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief The Total length of the stream that's currently being read.
+  ///
+  /// @return Length of the stream
+  ///
+  /// @remarks Optional and can leaved away or return -1 if this add-on won't
+  /// provide this function.
+  ///
   virtual int64_t LengthStream() { return -1; }
-
-  /*!
-     * @return Obtain the chunk size to use when reading streams.
-     * @remarks Return 0 if this add-on won't provide this function.
-     */
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Obtain the chunk size to use when reading streams.
+  ///
+  /// @return Block chunk size
+  ///
+  /// @remarks Optional and can leaved away or return 0 if this add-on won't
+  /// provide this function.
+  ///
   virtual int GetBlockSize() { return 0; }
+  //--------------------------------------------------------------------------
+
+  ///@}
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_Demux 2. Stream demuxing (optional)
+  /// @brief **Read demux streams.**
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_IDEMUX is set in the capabilities (see @ref GetCapabilities()).
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //============================================================================
+  /// @brief Get IDs of available streams
+  ///
+  /// @param[in] ids list of used identifications
+  /// @return true if successfully done, otherwise false
+  ///
+  /// @remarks This id's are used to identify wanted data on @ref GetStream call.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  ///
+  /// bool CMyInputstream::GetStreamIds(std::vector<unsigned int>& ids)
+  /// {
+  ///   kodi::Log(ADDON_LOG_DEBUG, "GetStreamIds(...)");
+  ///
+  ///   if (m_opened)
+  ///   {
+  ///     // This check not needed to have, the ABI checks also about, but make
+  ///     // sure you not give more as 32 streams.
+  ///     if (m_myStreams.size() > MAX_STREAM_COUNT)
+  ///     {
+  ///       kodi::Log(ADDON_LOG_ERROR, "Too many streams, only %u supported", MAX_STREAM_COUNT);
+  ///       return false;
+  ///     }
+  ///
+  ///     ids.emplace_back(m_myAudioStreamId);
+  ///
+  ///     for (const auto& streamPair : m_myOtherStreams)
+  ///     {
+  ///       ids.emplace_back(streamPair.second->uniqueId);
+  ///     }
+  ///   }
+  ///
+  ///   return !ids.empty();
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual bool GetStreamIds(std::vector<unsigned int>& ids) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Function for giving detailed stream information
+  ///
+  /// The associated information is set here for IDs previously given with
+  /// @ref GetStreamIds.
+  ///
+  /// This data is required to identify the associated codec and, if necessary,
+  /// to refer to your own codec (if available in the addon).
+  ///
+  /// @param[in] streamid unique id of stream
+  /// @param[out] stream Information data of wanted stream
+  /// @return true if successfully done, otherwise false
+  ///
+  /// @remarks Available stream id's previously asked by @ref GetStreamIds
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo_Help
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// bool CMyInputstream::GetStream(int streamid, kodi::addon::InputstreamInfo& stream)
+  /// {
+  ///   // This is just a small example, this type will be significantly larger
+  ///   // for larger and more complex streams.
+  ///   if (streamid == m_myAudioStreamId)
+  ///   {
+  ///     // This only a minimal exampl
+  ///     stream.SetStreamType(INPUTSTREAM_TYPE_AUDIO);
+  ///     stream.SetFeatures(INPUTSTREAM_FEATURE_NONE); // Only added to example, INPUTSTREAM_FEATURE_NONE is default and no need to call
+  ///     stream.SetFlags(INPUTSTREAM_FLAG_NONE); // Only added to example, INPUTSTREAM_FLAG_NONE is default and no need to call
+  ///     stream.SetCodecName("mp2"); // Codec name, string must by equal with FFmpeg, see https://github.com/FFmpeg/FFmpeg/blob/master/libavcodec/codec_desc.c
+  ///     stream.SetPhysicalIndex(1); // Identifier required to set
+  ///     stream.SetLanguage("en");
+  ///     stream.SetChannels(2);
+  ///     stream.SetSampleRate(48000);
+  ///     stream.SetBitRate(0);
+  ///     stream.SetBitsPerSample(16);
+  ///   }
+  ///   else ...
+  ///   ...
+  ///   return true;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual bool GetStream(int streamid, kodi::addon::InputstreamInfo& stream) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Enable or disable a stream.
+  ///
+  /// A disabled stream does not send demux packets
+  ///
+  /// @param[in] streamid unique id of stream
+  /// @param[in] enable true for enable, false for disable
+  ///
+  /// @remarks Available stream id's previously asked by @ref GetStreamIds
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// @note Valid implementation required.
+  ///
+  virtual void EnableStream(int streamid, bool enable) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Opens a stream for playback.
+  ///
+  /// @param[in] streamid unique id of stream
+  ///
+  /// @remarks Available stream id's previously asked by @ref GetStreamIds
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  /// @note Valid implementation required.
+  ///
+  virtual bool OpenStream(int streamid) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Reset the demultiplexer in the add-on.
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxReset() {}
+  //----------------------------------------------------------------------------
 
-  /*!
-     *  Check for real-time streaming
-     *  @return true if current stream is real-time
-     */
-  virtual bool IsRealTimeStream() { return true; }
+  //============================================================================
+  /// @brief Abort the demultiplexer thread in the add-on.
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxAbort() {}
+  //----------------------------------------------------------------------------
 
-  /*!
-     * @brief Allocate a demux packet. Free with FreeDemuxPacket
-     * @param dataSize The size of the data that will go into the packet
-     * @return The allocated packet
-     */
-  DemuxPacket* AllocateDemuxPacket(int dataSize)
+  //============================================================================
+  /// @brief Flush all data that's currently in the demultiplexer buffer in the add-on.
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxFlush() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Read the next packet from the demultiplexer, if there is one.
+  ///
+  /// @return The next packet.
+  ///         If there is no next packet, then the add-on should return the
+  ///         packet created by calling @ref AllocateDemuxPacket "AllocateDemuxPacket(0)" on the callback.
+  ///         If the stream changed and Kodi's player needs to be reinitialised,
+  ///         then, the add-on should call @ref AllocateDemuxPacket "AllocateDemuxPacket(0)" on the
+  ///         callback, and set the streamid to DMX_SPECIALID_STREAMCHANGE and
+  ///         return the value.
+  ///         The add-on should return <b>`nullptr`</b> if an error occured.
+  ///
+  /// @remarks Return <b>`nullptr`</b> if this add-on won't provide this function.
+  ///
+  virtual DEMUX_PACKET* DemuxRead() { return nullptr; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the InputStream addon/demuxer that Kodi wishes to seek the stream by time
+  ///
+  /// Demuxer is required to set stream to an IDR frame
+  ///
+  /// @param[in] time The absolute time since stream start
+  /// @param[in] backwards True to seek to keyframe BEFORE time, else AFTER
+  /// @param[in] startpts can be updated to point to where display should start
+  /// @return True if the seek operation was possible
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual bool DemuxSeekTime(double time, bool backwards, double& startpts) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the InputStream addon/demuxer that Kodi wishes to change playback speed
+  ///
+  /// @param[in] speed The requested playback speed
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxSetSpeed(int speed) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Sets desired width / height
+  ///
+  /// @param[in] width Width to set
+  /// @param[in] height Height to set
+  ///
+  virtual void SetVideoResolution(int width, int height) {}
+  //----------------------------------------------------------------------------
+
+  //=============================================================================
+  /// @brief Allocate a demux packet. Free with @ref FreeDemuxPacket
+  ///
+  /// @param[in] dataSize The size of the data that will go into the packet
+  /// @return The allocated packet
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  DEMUX_PACKET* AllocateDemuxPacket(int dataSize)
   {
     return m_instanceData->toKodi->allocate_demux_packet(m_instanceData->toKodi->kodiInstance,
                                                          dataSize);
   }
-
-  /*!
-     * @brief Allocate a demux packet. Free with FreeDemuxPacket
-     * @param dataSize The size of the data that will go into the packet
-     * @return The allocated packet
-     */
-  DemuxPacket* AllocateEncryptedDemuxPacket(int dataSize, unsigned int encryptedSubsampleCount)
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Allocate a encrypted demux packet. Free with @ref FreeDemuxPacket
+  ///
+  /// @param[in] dataSize The size of the data that will go into the packet
+  /// @param[in] encryptedSubsampleCount The encrypted subsample count
+  /// @return The allocated packet
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  DEMUX_PACKET* AllocateEncryptedDemuxPacket(int dataSize, unsigned int encryptedSubsampleCount)
   {
     return m_instanceData->toKodi->allocate_encrypted_demux_packet(
         m_instanceData->toKodi->kodiInstance, dataSize, encryptedSubsampleCount);
   }
-
-  /*!
-     * @brief Free a packet that was allocated with AllocateDemuxPacket
-     * @param packet The packet to free
-     */
-  void FreeDemuxPacket(DemuxPacket* packet)
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Free a packet that was allocated with AllocateDemuxPacket
+  ///
+  /// @param[in] packet The packet to free
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  void FreeDemuxPacket(DEMUX_PACKET* packet)
   {
     return m_instanceData->toKodi->free_demux_packet(m_instanceData->toKodi->kodiInstance, packet);
   }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_Time 3. Time (optional)
+  /// @brief **To get stream position time.**
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_IDISPLAYTIME is set in the capabilities (see @ref GetCapabilities()).
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //==========================================================================
+  /// @brief Totel time in ms
+  ///
+  /// @return Total time in milliseconds
+  ///
+  /// @remarks
+  ///
+  virtual int GetTotalTime() { return -1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Playing time in ms
+  ///
+  /// @return Playing time in milliseconds
+  ///
+  /// @remarks
+  ///
+  virtual int GetTime() { return -1; }
+  //--------------------------------------------------------------------------
+
+  ///@}
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_Times 4. Times (optional)
+  /// @brief **Another way to get stream position time.**
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_ITIME is set in the capabilities (see @ref GetCapabilities()).
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //============================================================================
+  /// @brief Get current timing values in PTS scale
+  ///
+  /// @param[out] times The with @ref InputstreamTimes to given times
+  /// @return true if successfully done, false if not
+  ///
+  /// @copydetails cpp_kodi_addon_inputstream_Defs_Times_Help
+  ///
+  /// @remarks
+  ///
+  virtual bool GetTimes(InputstreamTimes& times) { return false; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_PosTime 5. Position time (optional)
+  /// @brief **Third way get stream position time.**
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_IPOSTIME is set in the capabilities (see @ref GetCapabilities()).
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //============================================================================
+  /// @brief Positions inputstream to playing time given in ms
+  ///
+  /// @param[in] ms Position time in milliseconds
+  ///
+  /// @remarks
+  ///
+  virtual bool PosTime(int ms) { return false; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //############################################################################
+  /// @defgroup cpp_kodi_addon_inputstream_Chapter 6. Chapter (optional)
+  /// @brief **Used to get available chapters.**
+  ///
+  /// @note These are used and must be set by the addon if the @ref INPUTSTREAM_SUPPORTS_ICHAPTER is set in the capabilities (see @ref GetCapabilities()).
+  ///
+  /// @ingroup cpp_kodi_addon_inputstream
+  ///@{
+
+  //==========================================================================
+  ///
+  /// @brief Return currently selected chapter
+  ///
+  /// @return Chapter number
+  ///
+  /// @remarks
+  ///
+  virtual int GetChapter() { return -1; };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief Return number of available chapters
+  ///
+  /// @return Chapter count
+  ///
+  /// @remarks
+  ///
+  virtual int GetChapterCount() { return 0; };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief Return name of chapter
+  ///
+  /// @param[in] ch Chapter identifier
+  /// @return Chapter name
+  ///
+  /// @remarks
+  ///
+  virtual const char* GetChapterName(int ch) { return nullptr; };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief Return position if chapter # ch in milliseconds
+  ///
+  /// @param[in] ch Chapter to get position from
+  /// @return Position in milliseconds
+  ///
+  /// @remarks
+  ///
+  virtual int64_t GetChapterPos(int ch) { return 0; };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief Seek to the beginning of chapter # ch
+  ///
+  /// @param[in] ch Chapter to seek
+  /// @return True if successfully done, false if not
+  ///
+  /// @remarks
+  ///
+  virtual bool SeekChapter(int ch) { return false; };
+  //--------------------------------------------------------------------------
+
+  ///@}
 
 private:
   static int compareVersion(const int v1[3], const int v2[3])
@@ -752,9 +1827,10 @@ private:
     */
   }
 
-  inline static bool ADDON_Open(const AddonInstance_InputStream* instance, INPUTSTREAM* props)
+  inline static bool ADDON_Open(const AddonInstance_InputStream* instance,
+                                INPUTSTREAM_PROPERTY* props)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->Open(*props);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->Open(props);
   }
 
   inline static void ADDON_Close(const AddonInstance_InputStream* instance)
@@ -765,22 +1841,48 @@ private:
   inline static void ADDON_GetCapabilities(const AddonInstance_InputStream* instance,
                                            INPUTSTREAM_CAPABILITIES* capabilities)
   {
-    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
-        ->GetCapabilities(*capabilities);
+    InputstreamCapabilities caps(capabilities);
+    static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetCapabilities(caps);
   }
 
 
   // IDemux
-  inline static struct INPUTSTREAM_IDS ADDON_GetStreamIds(const AddonInstance_InputStream* instance)
+  inline static bool ADDON_GetStreamIds(const AddonInstance_InputStream* instance,
+                                        struct INPUTSTREAM_IDS* ids)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetStreamIds();
+    std::vector<unsigned int> idList;
+    bool ret =
+        static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetStreamIds(idList);
+    if (ret)
+    {
+      for (size_t i = 0; i < idList.size() && i < INPUTSTREAM_MAX_STREAM_COUNT; ++i)
+      {
+        ids->m_streamCount++;
+        ids->m_streamIds[i] = idList[i];
+      }
+    }
+    return ret;
   }
 
-  inline static struct INPUTSTREAM_INFO ADDON_GetStream(const AddonInstance_InputStream* instance,
-                                                        int streamid)
+  inline static bool ADDON_GetStream(
+      const AddonInstance_InputStream* instance,
+      int streamid,
+      struct INPUTSTREAM_INFO* info,
+      KODI_HANDLE* demuxStream,
+      KODI_HANDLE (*transfer_stream)(KODI_HANDLE handle,
+                                     int streamId,
+                                     struct INPUTSTREAM_INFO* stream))
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
-        ->GetStream(streamid);
+    InputstreamInfo infoData(info);
+    bool ret = static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)
+                   ->GetStream(streamid, infoData);
+    if (ret && transfer_stream)
+    {
+      // Do this with given callback to prevent memory problems and leaks. This
+      // then create on Kodi the needed class where then given back on demuxStream.
+      *demuxStream = transfer_stream(instance->toKodi->kodiInstance, streamid, info);
+    }
+    return ret;
   }
 
   inline static void ADDON_EnableStream(const AddonInstance_InputStream* instance,
@@ -812,7 +1914,7 @@ private:
     static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxFlush();
   }
 
-  inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
+  inline static DEMUX_PACKET* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
   {
     return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->DemuxRead();
   }
@@ -855,7 +1957,8 @@ private:
   inline static bool ADDON_GetTimes(const AddonInstance_InputStream* instance,
                                     INPUTSTREAM_TIMES* times)
   {
-    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetTimes(*times);
+    InputstreamTimes cppTimes(times);
+    return static_cast<CInstanceInputStream*>(instance->toAddon->addonInstance)->GetTimes(cppTimes);
   }
 
   // IPosTime
@@ -927,6 +2030,7 @@ private:
 
   AddonInstance_InputStream* m_instanceData;
 };
+//------------------------------------------------------------------------------
 
 } /* namespace addon */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h
index d5977a7..61e294f 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/PVR.h
@@ -36,7 +36,7 @@
  * Only must be min version increased if a new compile of addon breaks after
  * changes here.
  *
- * Have by add of new parts a look about **Doxygen** `\\ingroup`, so that
+ * Have by add of new parts a look about **Doxygen** `\@ingroup`, so that
  * added parts included in documentation.
  *
  * If you add addon side related documentation, where his dev need know, use `///`.
@@ -1477,22 +1477,39 @@ public:
   //----------------------------------------------------------------------------
 
   //============================================================================
-  /// @brief Tell the client the time frame to use when notifying epg events back to Kodi
+  /// @brief Tell the client the past time frame to use when notifying epg events back to Kodi
   ///
   /// The client might push epg events asynchronously to Kodi using the callback function
   /// @ref EpgEventStateChange. To be able to only push events that are actually of
-  /// interest for Kodi, client needs to know about the epg time frame Kodi uses. Kodi
-  /// supplies the current epg time frame value in @ref EpgMaxDays() when creating the
-  /// addon and calls @ref SetEPGTimeFrame later whenever Kodi's epg time frame value
-  /// changes.
+  /// interest for Kodi, client needs to know about the epg time frame Kodi uses. Kodi supplies
+  /// the current epg max past time frame value @ref EpgMaxPastDays() when creating the addon
+  /// and calls @ref SetEPGMaxPastDays later whenever Kodi's epg time frame value changes.
   ///
-  /// @param[in] days number of days from "now". @ref EPG_TIMEFRAME_UNLIMITED means that Kodi
-  ///                 is interested in all epg events, regardless of event times.
+  /// @param[in] pastDays number of days before "now". @ref EPG_TIMEFRAME_UNLIMITED means that Kodi
+  ///                     is interested in all epg events, regardless of event times.
   /// @return @ref PVR_ERROR_NO_ERROR if new value was successfully set.
   ///
   /// @remarks Required if @ref PVRCapabilities::SetSupportsEPG "supportsEPG" is set to true.
   ///
-  virtual PVR_ERROR SetEPGTimeFrame(int days) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  virtual PVR_ERROR SetEPGMaxPastDays(int pastDays) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Tell the client the future time frame to use when notifying epg events back to Kodi
+  ///
+  /// The client might push epg events asynchronously to Kodi using the callback function
+  /// @ref EpgEventStateChange. To be able to only push events that are actually of
+  /// interest for Kodi, client needs to know about the epg time frame Kodi uses. Kodi supplies
+  /// the current epg max future time frame value @ref EpgMaxFutureDays() when creating the addon
+  /// and calls @ref SetEPGMaxFutureDays later whenever Kodi's epg time frame value changes.
+  ///
+  /// @param[in] futureDays number of days from "now". @ref EPG_TIMEFRAME_UNLIMITED means that Kodi
+  ///                       is interested in all epg events, regardless of event times.
+  /// @return @ref PVR_ERROR_NO_ERROR if new value was successfully set.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsEPG "supportsEPG" is set to true.
+  ///
+  virtual PVR_ERROR SetEPGMaxFutureDays(int futureDays) { return PVR_ERROR_NOT_IMPLEMENTED; }
   //----------------------------------------------------------------------------
 
   //==========================================================================
@@ -1518,15 +1535,28 @@ public:
 
   //==========================================================================
   /// @brief **Callback to Kodi Function**\n
-  /// Get the Max days handled by Kodi.
+  /// Get the Max past days handled by Kodi.
   ///
-  /// If > @ref EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events
-  /// in the range from 'end time > now' to 'start time < now + EpgMaxDays().
+  /// If > @ref EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events in the
+  /// range from 'end time > now - EpgMaxPastDays()' to 'start time < now + EpgMaxFutureDays().
   /// @ref EPG_TIMEFRAME_UNLIMITED, notify all events.
   ///
-  /// @return The Max days handled by Kodi
+  /// @return The Max past days handled by Kodi
   ///
-  inline int EpgMaxDays() const { return m_instanceData->props->iEpgMaxDays; }
+  inline int EpgMaxPastDays() const { return m_instanceData->props->iEpgMaxPastDays; }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Get the Max future days handled by Kodi.
+  ///
+  /// If > @ref EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events in the
+  /// range from 'end time > now - EpgMaxPastDays()' to 'start time < now + EpgMaxFutureDays().
+  /// @ref EPG_TIMEFRAME_UNLIMITED, notify all events.
+  ///
+  /// @return The Max future days handled by Kodi
+  ///
+  inline int EpgMaxFutureDays() const { return m_instanceData->props->iEpgMaxFutureDays; }
   //----------------------------------------------------------------------------
 
   //==========================================================================
@@ -2324,7 +2354,7 @@ public:
   /// @remarks Required, and only used if addon has its own demuxer.
   /// Return `nullptr` if this add-on won't provide this function.
   ///
-  virtual DemuxPacket* DemuxRead() { return nullptr; }
+  virtual DEMUX_PACKET* DemuxRead() { return nullptr; }
   //----------------------------------------------------------------------------
 
   //============================================================================
@@ -2413,7 +2443,7 @@ public:
   ///
   /// @remarks Only called from addon itself
   ///
-  inline DemuxPacket* AllocateDemuxPacket(int iDataSize)
+  inline DEMUX_PACKET* AllocateDemuxPacket(int iDataSize)
   {
     return m_instanceData->toKodi->AllocateDemuxPacket(m_instanceData->toKodi->kodiInstance,
                                                        iDataSize);
@@ -2428,7 +2458,7 @@ public:
   ///
   /// @remarks Only called from addon itself.
   ///
-  inline void FreeDemuxPacket(DemuxPacket* pPacket)
+  inline void FreeDemuxPacket(DEMUX_PACKET* pPacket)
   {
     m_instanceData->toKodi->FreeDemuxPacket(m_instanceData->toKodi->kodiInstance, pPacket);
   }
@@ -2662,7 +2692,8 @@ private:
     m_instanceData->toAddon->IsEPGTagPlayable = ADDON_IsEPGTagPlayable;
     m_instanceData->toAddon->GetEPGTagEdl = ADDON_GetEPGTagEdl;
     m_instanceData->toAddon->GetEPGTagStreamProperties = ADDON_GetEPGTagStreamProperties;
-    m_instanceData->toAddon->SetEPGTimeFrame = ADDON_SetEPGTimeFrame;
+    m_instanceData->toAddon->SetEPGMaxPastDays = ADDON_SetEPGMaxPastDays;
+    m_instanceData->toAddon->SetEPGMaxFutureDays = ADDON_SetEPGMaxFutureDays;
     m_instanceData->toAddon->CallEPGMenuHook = ADDON_CallEPGMenuHook;
     //--==----==----==----==----==----==----==----==----==----==----==----==----==
     m_instanceData->toAddon->GetRecordingsAmount = ADDON_GetRecordingsAmount;
@@ -2998,10 +3029,17 @@ private:
     return error;
   }
 
-  inline static PVR_ERROR ADDON_SetEPGTimeFrame(const AddonInstance_PVR* instance, int days)
+  inline static PVR_ERROR ADDON_SetEPGMaxPastDays(const AddonInstance_PVR* instance, int pastDays)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SetEPGMaxPastDays(pastDays);
+  }
+
+  inline static PVR_ERROR ADDON_SetEPGMaxFutureDays(const AddonInstance_PVR* instance,
+                                                    int futureDays)
   {
     return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
-        ->SetEPGTimeFrame(days);
+        ->SetEPGMaxFutureDays(futureDays);
   }
 
   inline static PVR_ERROR ADDON_CallEPGMenuHook(const AddonInstance_PVR* instance,
@@ -3364,7 +3402,7 @@ private:
     static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxFlush();
   }
 
-  inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_PVR* instance)
+  inline static DEMUX_PACKET* ADDON_DemuxRead(const AddonInstance_PVR* instance)
   {
     return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxRead();
   }
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h
index 4902fcb..d4ac1aa 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Screensaver.h
@@ -41,7 +41,7 @@ namespace addon
 /// * <b><c>Render()</c></b> - Called at render time
 /// * <b><c>Stop()</c></b> - Called when the screensaver has no work
 ///
-/// Additionally, there are several \ref cpp_kodi_addon_screensaver_CB "other functions"
+/// Additionally, there are several @ref cpp_kodi_addon_screensaver_CB "other functions"
 /// available in which the child class can ask about the current hardware,
 /// including the device, display and several other parts.
 ///
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h
index 177bf72..dbfb833 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VFS.h
@@ -152,7 +152,7 @@ private:
 
 //##############################################################################
 /// @defgroup cpp_kodi_addon_vfs_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_addon_vfs
+/// @ingroup cpp_kodi_addon_vfs
 /// @brief **VFS add-on general variables**
 ///
 /// Used to exchange the available options between Kodi and addon.
@@ -161,7 +161,7 @@ private:
 
 //==============================================================================
 ///
-/// \addtogroup cpp_kodi_addon_vfs
+/// @addtogroup cpp_kodi_addon_vfs
 /// @brief \cpp_class{ kodi::addon::CInstanceVFS }
 /// **Virtual Filesystem (VFS) add-on instance**
 ///
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 12893db..7cf58a0 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -9,241 +9,456 @@
 #pragma once
 
 #include "../AddonBase.h"
-#include "../StreamCrypto.h"
-#include "../StreamCodec.h"
+#include "../c-api/addon-instance/video_codec.h"
+#include "inputstream/DemuxPacket.h"
+#include "inputstream/StreamCodec.h"
+#include "inputstream/StreamCrypto.h"
 
-#ifdef BUILD_KODI_ADDON
-#include "../DemuxPacket.h"
-#else
-#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
-#endif
+#ifdef __cplusplus
 
-extern "C"
+namespace kodi
+{
+namespace addon
 {
-  enum VIDEOCODEC_FORMAT
-  {
-    UnknownVideoFormat = 0,
-    VideoFormatYV12,
-    VideoFormatI420,
-    MaxVideoFormats
-  };
-
 
-  struct VIDEOCODEC_INITDATA
+class CInstanceVideoCodec;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata class VideoCodecInitdata
+/// @ingroup cpp_kodi_addon_videocodec_Defs
+/// @brief Initialization data to open a video codec stream.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN VideoCodecInitdata
+  : public CStructHdl<VideoCodecInitdata, VIDEOCODEC_INITDATA>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceVideoCodec;
+  /*! \endcond */
+
+public:
+  /// @defgroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata_Help Value Help
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata :</b>
+  /// | Name | Type | Get call
+  /// |------|------|----------
+  /// | **Codec type** | `VIDEOCODEC_TYPE` | @ref VideoCodecInitdata::GetCodecType "GetCodecType"
+  /// | **Codec profile** | `STREAMCODEC_PROFILE` | @ref VideoCodecInitdata::GetCodecProfile "GetCodecProfile"
+  /// | **Video formats** | `std::vector<VIDEOCODEC_FORMAT>` | @ref VideoCodecInitdata::GetVideoFormats "GetVideoFormats"
+  /// | **Width** | `uint32_t` | @ref VideoCodecInitdata::GetWidth "GetWidth"
+  /// | **Height** | `uint32_t` | @ref VideoCodecInitdata::GetHeight "GetHeight"
+  /// | **Extra data** | `const uint8_t*` | @ref VideoCodecInitdata::GetExtraData "GetExtraData"
+  /// | **Extra data size** | `unsigned int` | @ref VideoCodecInitdata::GetExtraDataSize "GetExtraDataSize"
+  /// | **Crypto session** | `kodi::addon::StreamCryptoSession` | @ref VideoCodecInitdata::GetCryptoSession "GetCryptoSession"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata
+  ///@{
+
+  /// @brief The codec type required by Kodi to process the stream.
+  ///
+  /// See @ref VIDEOCODEC_TYPE for possible values.
+  VIDEOCODEC_TYPE GetCodecType() const { return m_cStructure->codec; }
+
+  /// @brief Used profiles for non-scalable 2D video
+  STREAMCODEC_PROFILE GetCodecProfile() const { return m_cStructure->codecProfile; }
+
+  /// @brief The video stream representations requested by Kodi
+  ///
+  /// This contains a list of the required video formats. One of them has to
+  /// select the addon to return the created image.
+  ///
+  std::vector<VIDEOCODEC_FORMAT> GetVideoFormats() const
   {
-    enum Codec {
-      CodecUnknown = 0,
-      CodecVp8,
-      CodecH264,
-      CodecVp9
-    } codec;
-
-    STREAMCODEC_PROFILE codecProfile;
-
-    //UnknownVideoFormat is terminator
-    VIDEOCODEC_FORMAT *videoFormats;
-
-    uint32_t width, height;
-
-    const uint8_t *extraData;
-    unsigned int extraDataSize;
-
-    CRYPTO_INFO cryptoInfo;
-  };
-
-  struct VIDEOCODEC_PICTURE
+    std::vector<VIDEOCODEC_FORMAT> formats;
+    unsigned int i = 0;
+    while (i < VIDEOCODEC_FORMAT_MAXFORMATS &&
+           m_cStructure->videoFormats[i] != VIDEOCODEC_FORMAT_UNKNOWN)
+      formats.emplace_back(m_cStructure->videoFormats[i++]);
+    if (formats.empty())
+      formats.emplace_back(VIDEOCODEC_FORMAT_UNKNOWN);
+    return formats;
+  }
+
+  /// @brief Picture width.
+  uint32_t GetWidth() const { return m_cStructure->width; }
+
+  /// @brief Picture height.
+  uint32_t GetHeight() const { return m_cStructure->height; }
+
+  /// @brief Depending on the required decoding, additional data given by the stream.
+  const uint8_t* GetExtraData() const { return m_cStructure->extraData; }
+
+  /// @brief Size of the data given with @ref extraData.
+  unsigned int GetExtraDataSize() const { return m_cStructure->extraDataSize; }
+
+  /// @brief **Data to manage stream cryptography**\n
+  /// To get class structure manages any encryption values required in order to have
+  /// them available in their stream processing.
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_inputstream_Defs_Info_StreamCryptoSession_Help
+  ///
+  kodi::addon::StreamCryptoSession GetCryptoSession() const { return &m_cStructure->cryptoSession; }
+
+  ///@}
+
+private:
+  VideoCodecInitdata() = delete;
+  VideoCodecInitdata(const VideoCodecInitdata& session) : CStructHdl(session) {}
+  VideoCodecInitdata(const VIDEOCODEC_INITDATA* session) : CStructHdl(session) {}
+  VideoCodecInitdata(VIDEOCODEC_INITDATA* session) : CStructHdl(session) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_videocodec_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_videocodec
+/// @brief **Video codec add-on general variables**
+///
+/// Used to exchange the available options between Kodi and addon.
+///
+///
+
+//============================================================================
+///
+/// @addtogroup cpp_kodi_addon_videocodec
+/// @brief \cpp_class{ kodi::addon::CInstanceVideoCodec }
+/// **Video codec add-on instance**
+///
+/// This is an addon instance class to add an additional video decoder to Kodi
+/// using addon.
+///
+/// This means that either a new type of decoding can be introduced to an input
+/// stream add-on that requires special types of decoding.
+///
+/// When using the inputstream addon, @ref cpp_kodi_addon_inputstream_Defs_Interface_InputstreamInfo
+/// to @ref cpp_kodi_addon_inputstream_Defs_Info is used to declare that the
+/// decoder stored in the addon is used.
+///
+/// @note At the moment this can only be used together with input stream addons,
+/// independent use as a codec addon is not yet possible.
+///
+/// Include the header @ref VideoCodec.h "#include <kodi/addon-instance/VideoCodec.h>"
+/// to use this class.
+///
+/// --------------------------------------------------------------------------
+///
+/// **Example:**
+/// This as an example when used together with @ref cpp_kodi_addon_inputstream "kodi::addon::CInstanceInputStream".
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/Inputstream.h>
+/// #include <kodi/addon-instance/VideoCodec.h>
+///
+/// class CMyVideoCodec : public kodi::addon::CInstanceVideoCodec
+/// {
+/// public:
+///   CMyVideoCodec(KODI_HANDLE instance, CMyInputstream* inputstream);
+///   ...
+///
+/// private:
+///   CMyInputstream* m_inputstream;
+/// };
+///
+/// CMyVideoCodec::CMyVideoCodec(KODI_HANDLE instance,
+///                              const std::string& version,
+///                              CMyInputstream* inputstream)
+///   : kodi::addon::CInstanceVideoCodec(instance, version),
+///     m_inputstream(inputstream)
+/// {
+///   ...
+/// }
+/// ...
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyInputstream : public kodi::addon::CInstanceInputStream
+/// {
+/// public:
+///   CMyInputstream(KODI_HANDLE instance, const std::string& kodiVersion);
+///
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               std::string instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+///   ...
+/// };
+///
+/// CMyInputstream::CMyInputstream(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : kodi::addon::CInstanceInputStream(instance, kodiVersion)
+/// {
+///   ...
+/// }
+///
+/// ADDON_STATUS CMyInputstream::CreateInstance(int instanceType,
+///                                             std::string instanceID,
+///                                             KODI_HANDLE instance,
+///                                             const std::string& version,
+///                                             KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_VIDEOCODEC)
+///   {
+///     addonInstance = new CMyVideoCodec(instance, version, this);
+///     return ADDON_STATUS_OK;
+///   }
+///   return ADDON_STATUS_NOT_IMPLEMENTED;
+/// }
+///
+/// ...
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() { }
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               std::string instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       std::string instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_INPUTSTREAM)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Inputstream");
+///     addonInstance = new CMyInputstream(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyInputstream` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+///
+class ATTRIBUTE_HIDDEN CInstanceVideoCodec : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Video codec class constructor used to support multiple instance
+  /// types
+  ///
+  /// @param[in] instance The instance value given to <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>,
+  ///                     or by a inputstream instance if them declared as parent.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  explicit CInstanceVideoCodec(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_VIDEOCODEC))
   {
-    enum VideoPlane {
-      YPlane = 0,
-      UPlane,
-      VPlane,
-      MaxPlanes = 3,
-    };
-
-    enum Flags : uint32_t {
-      FLAG_DROP,
-      FLAG_DRAIN
-    };
-
-    VIDEOCODEC_FORMAT videoFormat;
-    uint32_t flags;
-
-    uint32_t width, height;
-
-    uint8_t *decodedData;
-    size_t decodedDataSize;
-
-    uint32_t planeOffsets[VideoPlane::MaxPlanes];
-    uint32_t stride[VideoPlane::MaxPlanes];
-
-    int64_t pts;
-
-    KODI_HANDLE videoBufferHandle; //< will be passed in release_frame_buffer
-  };
-
-  enum VIDEOCODEC_RETVAL
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation of multiple together with "
+                             "single instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Destructor
+  ///
+  ~CInstanceVideoCodec() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Open the decoder, returns true on success
+  ///
+  /// Decoders not capable of running multiple instances should return false in case
+  /// there is already a instance open.
+  ///
+  /// @param[in] initData Video codec init data
+  /// @return true if successfully done
+  ///
+  ///
+  /// ----------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata_Help
+  ///
+  virtual bool Open(const kodi::addon::VideoCodecInitdata& initData) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Reconfigure the decoder, returns true on success
+  ///
+  /// Decoders not capable of runnung multiple instances may be capable of reconfiguring
+  /// the running instance. If Reconfigure returns false, player will close / open
+  /// the decoder
+  ///
+  /// @param[in] initData Video codec reconfigure data
+  /// @return true if successfully done
+  ///
+  virtual bool Reconfigure(const kodi::addon::VideoCodecInitdata& initData) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief add data, decoder has to consume the entire packet
+  ///
+  /// @param[in] packet Data to process for decode
+  /// @return true if the packet was consumed or if resubmitting it is useless
+  ///
+  virtual bool AddData(const DEMUX_PACKET& packet) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief GetPicture controls decoding.
+  ///
+  /// Player calls it on every cycle it can signal a picture, request a buffer,
+  /// or return none, if nothing applies the data is valid until the next
+  /// GetPicture return @ref VC_PICTURE
+  ///
+  /// @param[in,out] Structure which contains the necessary data
+  /// @return The with @ref VIDEOCODEC_RETVAL return values
+  ///
+  virtual VIDEOCODEC_RETVAL GetPicture(VIDEOCODEC_PICTURE& picture) { return VC_ERROR; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief should return codecs name
+  ///
+  /// @return Codec name
+  ///
+  virtual const char* GetName() { return nullptr; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Reset the decoder
+  ///
+  virtual void Reset() {}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief AddonToKodi interface
+   */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief All picture members can be expected to be set correctly except
+  /// decodedData and pts.
+  ///
+  /// GetFrameBuffer has to set decodedData to a valid memory address and return true.
+  ///
+  /// @param[out] picture The buffer, or unmodified if false is returned
+  /// @return In case buffer allocation fails, it return false.
+  ///
+  /// @note If this returns true, buffer must be freed using @ref ReleaseFrameBuffer().
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool GetFrameBuffer(VIDEOCODEC_PICTURE& picture)
   {
-    VC_NONE = 0,        //< noop
-    VC_ERROR,           //< an error occurred, no other messages will be returned
-    VC_BUFFER,          //< the decoder needs more data
-    VC_PICTURE,         //< the decoder got a picture
-    VC_EOF,             //< the decoder signals EOF
-  };
-
-  // this are properties given to the addon on create
-  // at this time we have no parameters for the addon
-  typedef struct AddonProps_VideoCodec
+    return m_instanceData->toKodi->get_frame_buffer(m_instanceData->toKodi->kodiInstance, &picture);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_videocodec
+  /// @brief Release the with @ref GetFrameBuffer() given framebuffer.
+  ///
+  /// @param[in] handle the on @ref VIDEOCODEC_PICTURE.videoBufferHandle defined buffer handle
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  void ReleaseFrameBuffer(void* buffer)
   {
-    int dummy;
-  } AddonProps_VideoCodec;
+    return m_instanceData->toKodi->release_frame_buffer(m_instanceData->toKodi->kodiInstance,
+                                                        buffer);
+  }
+  //----------------------------------------------------------------------------
 
-  struct AddonInstance_VideoCodec;
-  typedef struct KodiToAddonFuncTable_VideoCodec
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
   {
-    KODI_HANDLE addonInstance;
-
-    //! \brief Opens a codec
-    bool (__cdecl* open) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData);
-
-    //! \brief Reconfigures a codec
-    bool (__cdecl* reconfigure) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData);
-
-    //! \brief Feed codec if requested from GetPicture() (return VC_BUFFER)
-    bool (__cdecl* add_data) (const AddonInstance_VideoCodec* instance, const DemuxPacket *packet);
-
-    //! \brief Get a decoded picture / request new data
-    VIDEOCODEC_RETVAL (__cdecl* get_picture) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_PICTURE *picture);
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_VideoCodec*>(instance);
+
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->open = ADDON_Open;
+    m_instanceData->toAddon->reconfigure = ADDON_Reconfigure;
+    m_instanceData->toAddon->add_data = ADDON_AddData;
+    m_instanceData->toAddon->get_picture = ADDON_GetPicture;
+    m_instanceData->toAddon->get_name = ADDON_GetName;
+    m_instanceData->toAddon->reset = ADDON_Reset;
+  }
+
+  inline static bool ADDON_Open(const AddonInstance_VideoCodec* instance,
+                                VIDEOCODEC_INITDATA* initData)
+  {
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Open(initData);
+  }
 
-    //! \brief Get the name of this video decoder
-    const char *(__cdecl* get_name) (const AddonInstance_VideoCodec* instance);
+  inline static bool ADDON_Reconfigure(const AddonInstance_VideoCodec* instance,
+                                       VIDEOCODEC_INITDATA* initData)
+  {
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
+        ->Reconfigure(initData);
+  }
 
-    //! \brief Reset the codec
-    void (__cdecl* reset)(const AddonInstance_VideoCodec* instance);
-  } KodiToAddonFuncTable_VideoCodec;
+  inline static bool ADDON_AddData(const AddonInstance_VideoCodec* instance,
+                                   const DEMUX_PACKET* packet)
+  {
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->AddData(*packet);
+  }
 
-  typedef struct AddonToKodiFuncTable_VideoCodec
+  inline static VIDEOCODEC_RETVAL ADDON_GetPicture(const AddonInstance_VideoCodec* instance,
+                                                   VIDEOCODEC_PICTURE* picture)
   {
-    KODI_HANDLE kodiInstance;
-    bool(*get_frame_buffer)(void* kodiInstance, VIDEOCODEC_PICTURE *picture);
-    void(*release_frame_buffer)(void* kodiInstance, void *buffer);
-  } AddonToKodiFuncTable_VideoCodec;
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
+        ->GetPicture(*picture);
+  }
 
-  typedef struct AddonInstance_VideoCodec
+  inline static const char* ADDON_GetName(const AddonInstance_VideoCodec* instance)
   {
-    AddonProps_VideoCodec* props;
-    AddonToKodiFuncTable_VideoCodec* toKodi;
-    KodiToAddonFuncTable_VideoCodec* toAddon;
-  } AddonInstance_VideoCodec;
-}
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->GetName();
+  }
 
-namespace kodi
-{
-  namespace addon
+  inline static void ADDON_Reset(const AddonInstance_VideoCodec* instance)
   {
+    return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Reset();
+  }
+
+  AddonInstance_VideoCodec* m_instanceData;
+};
 
-    class ATTRIBUTE_HIDDEN CInstanceVideoCodec : public IAddonInstance
-    {
-    public:
-      explicit CInstanceVideoCodec(KODI_HANDLE instance, const std::string& kodiVersion = "")
-        : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC,
-                         !kodiVersion.empty() ? kodiVersion
-                                              : GetKodiTypeVersion(ADDON_INSTANCE_VIDEOCODEC))
-      {
-        if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-          throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation of multiple together with single instance way is not allowed!");
-
-        SetAddonStruct(instance);
-      }
-
-      ~CInstanceVideoCodec() override = default;
-
-      //! \copydoc CInstanceVideoCodec::Open
-      virtual bool Open(VIDEOCODEC_INITDATA &initData) { return false; };
-
-      //! \copydoc CInstanceVideoCodec::Reconfigure
-      virtual bool Reconfigure(VIDEOCODEC_INITDATA &initData) { return false; };
-
-      //! \copydoc CInstanceVideoCodec::AddData
-      virtual bool AddData(const DemuxPacket &packet) { return false; };
-
-      //! \copydoc CInstanceVideoCodec::GetPicture
-      virtual VIDEOCODEC_RETVAL GetPicture(VIDEOCODEC_PICTURE &picture) { return VC_ERROR; };
-
-      //! \copydoc CInstanceVideoCodec::GetName
-      virtual const char *GetName() { return nullptr; };
-
-      //! \copydoc CInstanceVideoCodec::Reset
-      virtual void Reset() {};
-
-      /*!
-      * @brief AddonToKodi interface
-      */
-
-      //! \copydoc CInstanceVideoCodec::GetFrameBuffer
-      bool GetFrameBuffer(VIDEOCODEC_PICTURE &picture)
-      {
-        return m_instanceData->toKodi->get_frame_buffer(m_instanceData->toKodi->kodiInstance,
-                                                        &picture);
-      }
-
-      //! \copydoc CInstanceVideoCodec::ReleaseFrameBuffer
-      void ReleaseFrameBuffer(void *buffer)
-      {
-        return m_instanceData->toKodi->release_frame_buffer(m_instanceData->toKodi->kodiInstance,
-                                                            buffer);
-      }
-
-    private:
-      void SetAddonStruct(KODI_HANDLE instance)
-      {
-        if (instance == nullptr)
-          throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-        m_instanceData = static_cast<AddonInstance_VideoCodec*>(instance);
-
-        m_instanceData->toAddon->addonInstance = this;
-        m_instanceData->toAddon->open = ADDON_Open;
-        m_instanceData->toAddon->reconfigure = ADDON_Reconfigure;
-        m_instanceData->toAddon->add_data = ADDON_AddData;
-        m_instanceData->toAddon->get_picture = ADDON_GetPicture;
-        m_instanceData->toAddon->get_name = ADDON_GetName;
-        m_instanceData->toAddon->reset = ADDON_Reset;
-      }
-
-      inline static bool ADDON_Open(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Open(*initData);
-      }
-
-      inline static bool ADDON_Reconfigure(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
-            ->Reconfigure(*initData);
-      }
-
-      inline static bool ADDON_AddData(const AddonInstance_VideoCodec* instance, const DemuxPacket *packet)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
-            ->AddData(*packet);
-      }
-
-      inline static VIDEOCODEC_RETVAL ADDON_GetPicture(const AddonInstance_VideoCodec* instance, VIDEOCODEC_PICTURE *picture)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)
-            ->GetPicture(*picture);
-      }
-
-      inline static const char *ADDON_GetName(const AddonInstance_VideoCodec* instance)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->GetName();
-      }
-
-      inline static void ADDON_Reset(const AddonInstance_VideoCodec* instance)
-      {
-        return static_cast<CInstanceVideoCodec*>(instance->toAddon->addonInstance)->Reset();
-      }
-
-      AddonInstance_VideoCodec* m_instanceData;
-    };
-  } // namespace addon
+} // namespace addon
 } // namespace kodi
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h
index 7b1db65..1dddea2 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/Visualization.h
@@ -721,7 +721,7 @@ public:
   inline void TransferPresets(const std::vector<std::string>& presets)
   {
     m_instanceData->toKodi->clear_presets(m_instanceData->toKodi->kodiInstance);
-    for (auto it : presets)
+    for (const auto& it : presets)
       m_instanceData->toKodi->transfer_preset(m_instanceData->toKodi->kodiInstance, it.c_str());
   }
   //----------------------------------------------------------------------------
@@ -915,7 +915,7 @@ private:
     std::vector<std::string> presets;
     if (thisClass->GetPresets(presets))
     {
-      for (auto it : presets)
+      for (const auto& it : presets)
         thisClass->m_instanceData->toKodi->transfer_preset(addon->toKodi->kodiInstance, it.c_str());
     }
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/CMakeLists.txt
new file mode 100644
index 0000000..a551b4b
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(HEADERS DemuxPacket.h
+            StreamCodec.h
+            StreamConstants.h
+            TimingConstants.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_addon-instance_inputstream)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/DemuxPacket.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/DemuxPacket.h
new file mode 100644
index 0000000..f965b9f
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/DemuxPacket.h
@@ -0,0 +1,12 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "TimingConstants.h"
+#include "../../c-api/addon-instance/inputstream/demux_packet.h"
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCodec.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCodec.h
new file mode 100644
index 0000000..e80e2ca
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCodec.h
@@ -0,0 +1,11 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/addon-instance/inputstream/stream_codec.h"
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamConstants.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamConstants.h
new file mode 100644
index 0000000..200631b
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamConstants.h
@@ -0,0 +1,11 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/addon-instance/inputstream/stream_constants.h"
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCrypto.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCrypto.h
new file mode 100644
index 0000000..8a85121
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/StreamCrypto.h
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/addon-instance/inputstream/stream_crypto.h"
+#include "../../AddonBase.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+class CInstanceInputStream;
+class InputstreamInfo;
+class VideoCodecInitdata;
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption_StreamCryptoSession class StreamCryptoSession
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamEncryption
+/// @brief **Data to manage stream cryptography**\n
+/// This class structure manages any encryption values required in order to have
+/// them available in their stream processing.
+///
+/// Used on inputstream by @ref kodi::addon::InputstreamInfo::SetCryptoSession /
+/// @ref kodi::addon::InputstreamInfo::GetCryptoSession and are given to the
+/// used video codec to decrypt related data.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_inputstream_Defs_Info_StreamCryptoSession_Help
+///
+///@{
+class ATTRIBUTE_HIDDEN StreamCryptoSession
+  : public CStructHdl<StreamCryptoSession, STREAM_CRYPTO_SESSION>
+{
+  /*! \cond PRIVATE */
+  friend class CInstanceInputStream;
+  friend class InputstreamInfo;
+  friend class VideoCodecInitdata;
+  /*! \endcond */
+
+public:
+  /*! \cond PRIVATE */
+  StreamCryptoSession() { memset(m_cStructure, 0, sizeof(STREAM_CRYPTO_SESSION)); }
+  StreamCryptoSession(const StreamCryptoSession& session) : CStructHdl(session) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Info_StreamCryptoSession_Help Value Help
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Info_StreamCryptoSession
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_inputstream_Defs_Info_StreamCryptoSession :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Keysystem for encrypted media** | @ref STREAM_CRYPTO_KEY_SYSTEM | @ref StreamCryptoSession::SetKeySystem "SetKeySystem" | @ref StreamCryptoSession::GetKeySystem "GetKeySystem"
+  /// | **Flags for special conditions** | `uint8_t` | @ref StreamCryptoSession::SetFlags "SetFlags" | @ref StreamCryptoSession::GetFlags "GetFlags"
+  /// | **Crypto session key id** | `std::string` | @ref StreamCryptoSession::SetSessionId "SetSessionId" | @ref StreamCryptoSession::GetSessionId "GetSessionId"
+
+  /// @brief To set keysystem for encrypted media, @ref STREAM_CRYPTO_KEY_SYSTEM_NONE for
+  /// unencrypted media.
+  ///
+  /// See @ref STREAM_CRYPTO_KEY_SYSTEM for available options.
+  void SetKeySystem(STREAM_CRYPTO_KEY_SYSTEM keySystem) { m_cStructure->keySystem = keySystem; }
+
+  /// @brief Get keysystem for encrypted media.
+  STREAM_CRYPTO_KEY_SYSTEM GetKeySystem() const { return m_cStructure->keySystem; }
+
+  /// @brief Set bit flags to use special conditions, see @ref STREAM_CRYPTO_FLAGS
+  /// for available flags.
+  void SetFlags(uint8_t flags) { m_cStructure->flags = flags; }
+
+  /// @brief Get flags for special conditions.
+  uint8_t GetFlags() const { return m_cStructure->flags; }
+
+  /// @brief To set the crypto session key identifier.
+  void SetSessionId(const std::string& sessionId)
+  {
+    strncpy(m_cStructure->sessionId, sessionId.c_str(), sizeof(m_cStructure->sessionId) - 1);
+  }
+
+  /// @brief To get the crypto session key identifier.
+  std::string GetSessionId() const { return m_cStructure->sessionId; }
+
+private:
+  StreamCryptoSession(const STREAM_CRYPTO_SESSION* session) : CStructHdl(session) {}
+  StreamCryptoSession(STREAM_CRYPTO_SESSION* session) : CStructHdl(session) {}
+};
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/TimingConstants.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/TimingConstants.h
new file mode 100644
index 0000000..22f8952
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/inputstream/TimingConstants.h
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../c-api/addon-instance/inputstream/timing_constants.h"
+
+#ifdef __cplusplus
+
+// Unset the on timing_constants.h given defines
+#undef STREAM_TIME_TO_MSEC
+#undef STREAM_SEC_TO_TIME
+#undef STREAM_MSEC_TO_TIME
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Converts a stream time to milliseconds as an integer value.
+///
+/// @param[in] x Stream time
+/// @return Milliseconds
+///
+/// @note Within "C" code this is used as `#define`.
+///
+constexpr int STREAM_TIME_TO_MSEC(double x)
+{
+  return static_cast<int>(x * 1000 / STREAM_TIME_BASE);
+}
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Converts a time in seconds to the used stream time format.
+///
+/// @param[in] x Seconds
+/// @return Stream time
+///
+/// @note Within "C" code this is used as `#define`.
+///
+constexpr double STREAM_SEC_TO_TIME(double x)
+{
+  return x * STREAM_TIME_BASE;
+}
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Converts a time in milliseconds to the used stream time format.
+///
+/// @param[in] x Milliseconds
+/// @return Stream time
+///
+/// @note Within "C" code this is used as `#define`.
+///
+constexpr double STREAM_MSEC_TO_TIME(double x)
+{
+  return x * STREAM_TIME_BASE / 1000;
+}
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h
index febaeb9..1a6cc63 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/peripheral/PeripheralUtils.h
@@ -806,7 +806,7 @@ struct DriverPrimitive
 {
 protected:
   /*!
-   * \brief Construct a driver primitive of the specified type
+   * @brief Construct a driver primitive of the specified type
    */
   DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE type, unsigned int driverIndex)
     : m_type(type), m_driverIndex(driverIndex)
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h
index 5613947..4241c23 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/addon-instance/pvr/Stream.h
@@ -166,7 +166,7 @@ public:
     m_cStructure->strLanguage[0] = language[0];
     m_cStructure->strLanguage[1] = language[1];
     m_cStructure->strLanguage[2] = language[2];
-    m_cStructure->strLanguage[2] = 0;
+    m_cStructure->strLanguage[3] = 0;
   }
 
   /// @brief To get with @ref SetLanguage() changed values.
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
index 4edd034..b5d0382 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
@@ -2,10 +2,12 @@ set(HEADERS audio_decoder.h
             audio_encoder.h
             game.h
             image_decoder.h
+            inputstream.h
             peripheral.h
             pvr.h
             screensaver.h
             vfs.h
+            video_codec.h
             visualization.h)
 
 if(NOT ENABLE_STATIC_LIBS)
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h
index 8b75ddb..be6ad16 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_decoder.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_AUDIO_DECODER_H
 #define C_API_ADDONINSTANCE_AUDIO_DECODER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h
index 6f24d1c..b9f2ab5 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/audio_encoder.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_AUDIO_ENCODER_H
 #define C_API_ADDONINSTANCE_AUDIO_ENCODER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h
index c97fa5d..b1de817 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/game.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_GAME_H
 #define C_API_ADDONINSTANCE_GAME_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
index 6455b38..7093212 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_IMAGE_DECODER_H
 #define C_API_ADDONINSTANCE_IMAGE_DECODER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream.h
new file mode 100644
index 0000000..1b3a735
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream.h
@@ -0,0 +1,703 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_H
+
+#include "../addon_base.h"
+#include "inputstream/demux_packet.h"
+#include "inputstream/stream_codec.h"
+#include "inputstream/stream_constants.h"
+#include "inputstream/stream_crypto.h"
+#include "inputstream/timing_constants.h"
+
+#include <time.h>
+
+// Increment this level always if you add features which can lead to compile failures in the addon
+#define INPUTSTREAM_VERSION_LEVEL 4
+
+#define INPUTSTREAM_MAX_INFO_COUNT 8
+#define INPUTSTREAM_MAX_STREAM_COUNT 256
+#define INPUTSTREAM_MAX_STRING_NAME_SIZE 256
+#define INPUTSTREAM_MAX_STRING_CODEC_SIZE 32
+#define INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE 64
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //==============================================================================
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface_InputstreamCapabilities
+  /// @brief **Capability types of inputstream addon.**\n
+  /// This values are needed to tell Kodi which options are supported on the addon.
+  ///
+  /// If one of this is defined, then the corresponding methods from
+  /// @ref cpp_kodi_addon_inputstream "kodi::addon::CInstanceInputStream" need
+  /// to be implemented.
+  ///
+  /// Used on @ref kodi::addon::CInstanceInputStream::GetCapabilities().
+  ///
+  ///@{
+  enum INPUTSTREAM_MASKTYPE
+  {
+    /// @brief **0000 0000 0000 0001 :** Supports interface demuxing.
+    ///
+    /// If set must be @ref cpp_kodi_addon_inputstream_Demux "Demux support" included.
+    INPUTSTREAM_SUPPORTS_IDEMUX = (1 << 0),
+
+    /// @brief **0000 0000 0000 0010 :** Supports interface position time.
+    ///
+    /// This means that the start time and the current stream time are used.
+    ///
+    /// If set must be @ref cpp_kodi_addon_inputstream_Time "Time support" included.
+    INPUTSTREAM_SUPPORTS_IPOSTIME = (1 << 1),
+
+    /// @brief **0000 0000 0000 0100 :** Supports interface for display time.
+    ///
+    /// This will call up the complete stream time information. The start time
+    /// and the individual PTS times are then given using @ref cpp_kodi_addon_inputstream_Defs_Times.
+    ///
+    /// If set must be @ref cpp_kodi_addon_inputstream_Times "Times support" included.
+    INPUTSTREAM_SUPPORTS_IDISPLAYTIME = (1 << 2),
+
+    /// @brief **0000 0000 0000 1000 :** Supports seek
+    INPUTSTREAM_SUPPORTS_SEEK = (1 << 3),
+
+    /// @brief **0000 0000 0001 0000 :** Supports pause
+    INPUTSTREAM_SUPPORTS_PAUSE = (1 << 4),
+
+    /// @brief **0000 0000 0010 0000 :** Supports interface to give position time.
+    ///
+    /// This will only ask for the current time of the stream, not for length or
+    /// start.
+    ///
+    /// If set must be @ref cpp_kodi_addon_inputstream_PosTime "Position time support" included.
+    INPUTSTREAM_SUPPORTS_ITIME = (1 << 5),
+
+    /// @brief **0000 0000 0100 0000 :** Supports interface for chapter selection.
+    ///
+    /// If set must be @ref cpp_kodi_addon_inputstream_Chapter "Chapter support" included.
+    INPUTSTREAM_SUPPORTS_ICHAPTER = (1 << 6),
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
+   */
+  struct INPUTSTREAM_CAPABILITIES
+  {
+    /// set of supported capabilities
+    uint32_t m_mask;
+  };
+
+  /*!
+   * @brief structure of key/value pairs passed to addon on Open()
+   */
+  struct INPUTSTREAM_PROPERTY
+  {
+    const char* m_strURL;
+    const char* m_mimeType;
+
+    unsigned int m_nCountInfoValues;
+    struct LISTITEMPROPERTY
+    {
+      const char* m_strKey;
+      const char* m_strValue;
+    } m_ListItemProperties[STREAM_MAX_PROPERTY_COUNT];
+
+    const char* m_libFolder;
+    const char* m_profileFolder;
+  };
+
+  /*!
+   * @brief Array of stream IDs
+   */
+  struct INPUTSTREAM_IDS
+  {
+    unsigned int m_streamCount;
+    unsigned int m_streamIds[INPUTSTREAM_MAX_STREAM_COUNT];
+  };
+
+  /*!
+   * @brief MASTERING Metadata
+   */
+  struct INPUTSTREAM_MASTERING_METADATA
+  {
+    double primary_r_chromaticity_x;
+    double primary_r_chromaticity_y;
+    double primary_g_chromaticity_x;
+    double primary_g_chromaticity_y;
+    double primary_b_chromaticity_x;
+    double primary_b_chromaticity_y;
+    double white_point_chromaticity_x;
+    double white_point_chromaticity_y;
+    double luminance_max;
+    double luminance_min;
+  };
+
+  /*!
+   * @brief CONTENTLIGHT Metadata
+   */
+  struct INPUTSTREAM_CONTENTLIGHT_METADATA
+  {
+    uint64_t max_cll;
+    uint64_t max_fall;
+  };
+
+  //==============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_TYPE enum INPUTSTREAM_TYPE
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream types**\n
+  /// To identify type on stream.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetStreamType and @ref kodi::addon::InputstreamInfo::GetStreamType.
+  ///
+  ///@{
+  enum INPUTSTREAM_TYPE
+  {
+    /// @brief **0 :** To set nothing defined
+    INPUTSTREAM_TYPE_NONE = 0,
+
+    /// @brief **1 :** To identify @ref cpp_kodi_addon_inputstream_Defs_Info as Video
+    INPUTSTREAM_TYPE_VIDEO,
+
+    /// @brief **2 :** To identify @ref cpp_kodi_addon_inputstream_Defs_Info as Audio
+    INPUTSTREAM_TYPE_AUDIO,
+
+    /// @brief **3 :** To identify @ref cpp_kodi_addon_inputstream_Defs_Info as Subtitle
+    INPUTSTREAM_TYPE_SUBTITLE,
+
+    /// @brief **4 :** To identify @ref cpp_kodi_addon_inputstream_Defs_Info as Teletext
+    INPUTSTREAM_TYPE_TELETEXT,
+
+    /// @brief **5 :** To identify @ref cpp_kodi_addon_inputstream_Defs_Info as Radio RDS
+    INPUTSTREAM_TYPE_RDS,
+  };
+  ///@}
+  //------------------------------------------------------------------------------
+
+  //==============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_CODEC_FEATURES enum INPUTSTREAM_CODEC_FEATURES
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream codec features**\n
+  /// To identify special extra features used for optional codec on inputstream.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetFeatures and @ref kodi::addon::InputstreamInfo::GetFeatures.
+  ///
+  /// @note These variables are bit flags which are created using "|" can be used together.
+  ///
+  ///@{
+  enum INPUTSTREAM_CODEC_FEATURES
+  {
+    /// @brief **0000 0000 0000 0000 :** Empty to set if nothing is used
+    INPUTSTREAM_FEATURE_NONE = 0,
+
+    /// @brief **0000 0000 0000 0001 :** To set addon decode should used with @ref cpp_kodi_addon_videocodec.
+    INPUTSTREAM_FEATURE_DECODE = (1 << 0)
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_FLAGS enum INPUTSTREAM_FLAGS
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream flags**\n
+  /// To identify extra stream flags used on inputstream.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetFlags and @ref kodi::addon::InputstreamInfo::GetFlags.
+  ///
+  /// @note These variables are bit flags which are created using "|" can be used together.
+  ///
+  ///@{
+  enum INPUTSTREAM_FLAGS
+  {
+    /// @brief **0000 0000 0000 0000 :** Empty to set if nothing is used
+    INPUTSTREAM_FLAG_NONE = 0,
+
+    /// @brief **0000 0000 0000 0001 :** Default
+    INPUTSTREAM_FLAG_DEFAULT = (1 << 0),
+
+    /// @brief **0000 0000 0000 0010 :** Dub
+    INPUTSTREAM_FLAG_DUB = (1 << 1),
+
+    /// @brief **0000 0000 0000 0100 :** Original
+    INPUTSTREAM_FLAG_ORIGINAL = (1 << 2),
+
+    /// @brief **0000 0000 0000 1000 :** Comment
+    INPUTSTREAM_FLAG_COMMENT = (1 << 3),
+
+    /// @brief **0000 0000 0001 0000 :** Lyrics
+    INPUTSTREAM_FLAG_LYRICS = (1 << 4),
+
+    /// @brief **0000 0000 0010 0000 :** Karaoke
+    INPUTSTREAM_FLAG_KARAOKE = (1 << 5),
+
+    /// @brief **0000 0000 0100 0000 :** Forced
+    INPUTSTREAM_FLAG_FORCED = (1 << 6),
+
+    /// @brief **0000 0000 1000 0000 :** Hearing impaired
+    INPUTSTREAM_FLAG_HEARING_IMPAIRED = (1 << 7),
+
+    /// @brief **0000 0001 0000 0000 :** Visual impaired
+    INPUTSTREAM_FLAG_VISUAL_IMPAIRED = (1 << 8),
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  // Keep in sync with AVColorSpace
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_COLORSPACE enum INPUTSTREAM_COLORSPACE
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream color space flags**\n
+  /// YUV colorspace type. These values match the ones defined by ISO/IEC 23001-8_2013 § 7.3.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetColorSpace and @ref kodi::addon::InputstreamInfo::GetColorSpace.
+  ///
+  ///@{
+  enum INPUTSTREAM_COLORSPACE
+  {
+    /// @brief **0 :** Order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB)
+    INPUTSTREAM_COLORSPACE_RGB = 0,
+
+    /// @brief **1 :** Also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    INPUTSTREAM_COLORSPACE_BT709 = 1,
+
+    /// @brief **2 :** To set stream is unspecified
+    INPUTSTREAM_COLORSPACE_UNSPECIFIED = 2,
+
+    /// @brief **2 :** To set stream is unkown
+    /// @note Same as @ref INPUTSTREAM_COLORSPACE_UNSPECIFIED
+    INPUTSTREAM_COLORSPACE_UNKNOWN = INPUTSTREAM_COLORSPACE_UNSPECIFIED, // compatibility
+
+    /// @brief **3 :** To set colorspace reserved
+    INPUTSTREAM_COLORSPACE_RESERVED = 3,
+
+    /// @brief **4 :** FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
+    INPUTSTREAM_COLORSPACE_FCC = 4,
+
+    /// @brief **5 :** Also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    INPUTSTREAM_COLORSPACE_BT470BG = 5,
+
+    /// @brief **6 :** Also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    INPUTSTREAM_COLORSPACE_SMPTE170M = 6,
+
+    /// @brief **7 :** Functionally identical to above @ref INPUTSTREAM_COLORSPACE_SMPTE170M
+    INPUTSTREAM_COLORSPACE_SMPTE240M = 7,
+
+    /// @brief **8 :** Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    INPUTSTREAM_COLORSPACE_YCGCO = 8,
+
+    /// @brief **8 :** To set colorspace as YCOCG
+    /// @note Same as @ref INPUTSTREAM_COLORSPACE_YCGCO
+    INPUTSTREAM_COLORSPACE_YCOCG = INPUTSTREAM_COLORSPACE_YCGCO,
+
+    /// @brief **9 :** ITU-R BT2020 non-constant luminance system
+    INPUTSTREAM_COLORSPACE_BT2020_NCL = 9,
+
+    /// @brief **10 :** ITU-R BT2020 constant luminance system
+    INPUTSTREAM_COLORSPACE_BT2020_CL = 10,
+
+    /// @brief **11 :** SMPTE 2085, Y'D'zD'x
+    INPUTSTREAM_COLORSPACE_SMPTE2085 = 11,
+
+    /// @brief **12 :** Chromaticity-derived non-constant luminance system
+    INPUTSTREAM_COLORSPACE_CHROMA_DERIVED_NCL = 12,
+
+    /// @brief **13 :** Chromaticity-derived constant luminance system
+    INPUTSTREAM_COLORSPACE_CHROMA_DERIVED_CL = 13,
+
+    /// @brief **14 :** ITU-R BT.2100-0, ICtCp
+    INPUTSTREAM_COLORSPACE_ICTCP = 14,
+
+    /// @brief The maximum value to use in a list.
+    INPUTSTREAM_COLORSPACE_MAX
+  };
+  ///@}
+  //------------------------------------------------------------------------------
+
+  // Keep in sync with AVColorPrimaries
+  //==============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_COLORPRIMARIES enum INPUTSTREAM_COLORPRIMARIES
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream color primaries flags**\n
+  /// Chromaticity coordinates of the source primaries. These values match the ones defined by ISO/IEC 23001-8_2013 § 7.1.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetColorPrimaries and @ref kodi::addon::InputstreamInfo::GetColorPrimaries.
+  ///
+  ///@{
+  enum INPUTSTREAM_COLORPRIMARIES
+  {
+    /// @brief **0 :** Reserved
+    INPUTSTREAM_COLORPRIMARY_RESERVED0 = 0,
+
+    /// @brief **1 :** Also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+    INPUTSTREAM_COLORPRIMARY_BT709 = 1,
+
+    /// @brief **2 :** Unspecified
+    INPUTSTREAM_COLORPRIMARY_UNSPECIFIED = 2,
+
+    /// @brief **3 :** Reserved
+    INPUTSTREAM_COLORPRIMARY_RESERVED = 3,
+
+    /// @brief **4 :** Also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
+    INPUTSTREAM_COLORPRIMARY_BT470M = 4,
+
+    /// @brief **5 :** Also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+    INPUTSTREAM_COLORPRIMARY_BT470BG = 5,
+
+    /// @brief **6 :** Also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+    INPUTSTREAM_COLORPRIMARY_SMPTE170M = 6,
+
+    /// @brief **7 :** Functionally identical to above
+    INPUTSTREAM_COLORPRIMARY_SMPTE240M = 7,
+
+    /// @brief **8 :** Colour filters using Illuminant C
+    INPUTSTREAM_COLORPRIMARY_FILM = 8,
+
+    /// @brief **9 :** ITU-R BT2020
+    INPUTSTREAM_COLORPRIMARY_BT2020 = 9,
+
+    /// @brief **10 :** SMPTE ST 428-1 (CIE 1931 XYZ)
+    INPUTSTREAM_COLORPRIMARY_SMPTE428 = 10,
+
+    /// @brief **10 :**
+    /// @note Same as @ref INPUTSTREAM_COLORPRIMARY_SMPTE428
+    INPUTSTREAM_COLORPRIMARY_SMPTEST428_1 = INPUTSTREAM_COLORPRIMARY_SMPTE428,
+
+    /// @brief **11 :** SMPTE ST 431-2 (2011) / DCI P3
+    INPUTSTREAM_COLORPRIMARY_SMPTE431 = 11,
+
+    /// @brief **12 :** SMPTE ST 432-1 (2010) / P3 D65 / Display P3
+    INPUTSTREAM_COLORPRIMARY_SMPTE432 = 12,
+
+    /// @brief **22 :** JEDEC P22 phosphors
+    INPUTSTREAM_COLORPRIMARY_JEDEC_P22 = 22,
+
+    /// @brief The maximum value to use in a list.
+    INPUTSTREAM_COLORPRIMARY_MAX
+  };
+  ///@}
+  //------------------------------------------------------------------------------
+
+  // Keep in sync with AVColorRange
+  //==============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_COLORRANGE enum INPUTSTREAM_COLORRANGE
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream color range flags**\n
+  /// MPEG vs JPEG YUV range.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetColorRange and @ref kodi::addon::InputstreamInfo::GetColorRange.
+  ///
+  ///@{
+  enum INPUTSTREAM_COLORRANGE
+  {
+    /// @brief **0 :** To define as unkown
+    INPUTSTREAM_COLORRANGE_UNKNOWN = 0,
+
+    /// @brief **1 :** The normal 219*2^(n-8) "MPEG" YUV ranges
+    INPUTSTREAM_COLORRANGE_LIMITED,
+
+    /// @brief **2 :** The normal 2^n-1 "JPEG" YUV ranges
+    INPUTSTREAM_COLORRANGE_FULLRANGE,
+
+    /// @brief The maximum value to use in a list.
+    INPUTSTREAM_COLORRANGE_MAX
+  };
+  ///@}
+  //------------------------------------------------------------------------------
+
+  // keep in sync with AVColorTransferCharacteristic
+  //==============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_INPUTSTREAM_COLORTRC enum INPUTSTREAM_COLORTRC
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Inputstream color TRC flags**\n
+  /// Color Transfer Characteristic. These values match the ones defined by ISO/IEC 23001-8_2013 § 7.2.
+  ///
+  /// Used on @ref kodi::addon::InputstreamInfo::SetColorTransferCharacteristic and @ref kodi::addon::InputstreamInfo::GetColorTransferCharacteristic.
+  ///
+  ///@{
+  enum INPUTSTREAM_COLORTRC
+  {
+    /// @brief **0 :** Reserved
+    INPUTSTREAM_COLORTRC_RESERVED0 = 0,
+
+    /// @brief **1 :** Also ITU-R BT1361
+    INPUTSTREAM_COLORTRC_BT709 = 1,
+
+    /// @brief **2 :** Unspecified
+    INPUTSTREAM_COLORTRC_UNSPECIFIED = 2,
+
+    /// @brief **3 :** Reserved
+    INPUTSTREAM_COLORTRC_RESERVED = 3,
+
+    /// @brief **4 :** Also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    INPUTSTREAM_COLORTRC_GAMMA22 = 4,
+
+    /// @brief **5 :** Also ITU-R BT470BG
+    INPUTSTREAM_COLORTRC_GAMMA28 = 5,
+
+    /// @brief **6 :** Also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
+    INPUTSTREAM_COLORTRC_SMPTE170M = 6,
+
+    /// @brief **7 :** Functionally identical to above @ref INPUTSTREAM_COLORTRC_SMPTE170M
+    INPUTSTREAM_COLORTRC_SMPTE240M = 7,
+
+    /// @brief **8 :** Linear transfer characteristics
+    INPUTSTREAM_COLORTRC_LINEAR = 8,
+
+    /// @brief **9 :** Logarithmic transfer characteristic (100:1 range)
+    INPUTSTREAM_COLORTRC_LOG = 9,
+
+    /// @brief **10 :** Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range)
+    INPUTSTREAM_COLORTRC_LOG_SQRT = 10,
+
+    /// @brief **11 :** IEC 61966-2-4
+    INPUTSTREAM_COLORTRC_IEC61966_2_4 = 11,
+
+    /// @brief **12 :** ITU-R BT1361 Extended Colour Gamut
+    INPUTSTREAM_COLORTRC_BT1361_ECG = 12,
+
+    /// @brief **13 :** IEC 61966-2-1 (sRGB or sYCC)
+    INPUTSTREAM_COLORTRC_IEC61966_2_1 = 13,
+
+    /// @brief **14 :**  ITU-R BT2020 for 10-bit system
+    INPUTSTREAM_COLORTRC_BT2020_10 = 14,
+
+    /// @brief **15 :**  ITU-R BT2020 for 12-bit system
+    INPUTSTREAM_COLORTRC_BT2020_12 = 15,
+
+    /// @brief **16 :**  SMPTE ST 2084 for 10-, 12-, 14- and 16-bit systems
+    INPUTSTREAM_COLORTRC_SMPTE2084 = 16,
+
+    /// @brief **16 :** Same as @ref INPUTSTREAM_COLORTRC_SMPTE2084
+    INPUTSTREAM_COLORTRC_SMPTEST2084 = INPUTSTREAM_COLORTRC_SMPTE2084,
+
+    /// @brief **17 :**  SMPTE ST 428-1
+    INPUTSTREAM_COLORTRC_SMPTE428 = 17,
+
+    /// @brief **17 :**  Same as @ref INPUTSTREAM_COLORTRC_SMPTE428
+    INPUTSTREAM_COLORTRC_SMPTEST428_1 = INPUTSTREAM_COLORTRC_SMPTE428,
+
+    /// @brief **18 :**  ARIB STD-B67, known as "Hybrid log-gamma"
+    INPUTSTREAM_COLORTRC_ARIB_STD_B67 = 18,
+
+    /// @brief The maximum value to use in a list.
+    INPUTSTREAM_COLORTRC_MAX
+  };
+  ///@}
+  //------------------------------------------------------------------------------
+
+  /*!
+   * @brief stream properties
+   */
+  struct INPUTSTREAM_INFO
+  {
+    enum INPUTSTREAM_TYPE m_streamType;
+    uint32_t m_features;
+    uint32_t m_flags;
+
+    //! @brief (optional) name of the stream, \0 for default handling
+    char m_name[INPUTSTREAM_MAX_STRING_NAME_SIZE];
+
+    //! @brief (required) name of codec according to ffmpeg
+    char m_codecName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+
+    //! @brief (optional) internal name of codec (selectionstream info)
+    char m_codecInternalName[INPUTSTREAM_MAX_STRING_CODEC_SIZE];
+
+    //! @brief (optional) the profile of the codec
+    enum STREAMCODEC_PROFILE m_codecProfile;
+
+    //! @brief (required) physical index
+    unsigned int m_pID;
+
+    const uint8_t* m_ExtraData;
+    unsigned int m_ExtraSize;
+
+    //! @brief RFC 5646 language code (empty string if undefined)
+    char m_language[INPUTSTREAM_MAX_STRING_LANGUAGE_SIZE];
+
+    //! Video stream related data
+    //@{
+
+    //! @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps
+    unsigned int m_FpsScale;
+
+    unsigned int m_FpsRate;
+
+    //! @brief height of the stream reported by the demuxer
+    unsigned int m_Height;
+
+    //! @brief width of the stream reported by the demuxer
+    unsigned int m_Width;
+
+    //! @brief display aspect of stream
+    float m_Aspect;
+
+    //@}
+
+    //! Audio stream related data
+    //@{
+
+    //! @brief (required) amount of channels
+    unsigned int m_Channels;
+
+    //! @brief (required) sample rate
+    unsigned int m_SampleRate;
+
+    //! @brief (required) bit rate
+    unsigned int m_BitRate;
+
+    //! @brief (required) bits per sample
+    unsigned int m_BitsPerSample;
+
+    unsigned int m_BlockAlign;
+
+    //@}
+
+    struct STREAM_CRYPTO_SESSION m_cryptoSession;
+
+    // new in API version 2.0.8
+    //@{
+    //! @brief Codec If available, the fourcc code codec
+    unsigned int m_codecFourCC;
+
+    //! @brief definition of colorspace
+    enum INPUTSTREAM_COLORSPACE m_colorSpace;
+
+    //! @brief color range if available
+    enum INPUTSTREAM_COLORRANGE m_colorRange;
+    //@}
+
+    //new in API 2.0.9 / INPUTSTREAM_VERSION_LEVEL 1
+    //@{
+    enum INPUTSTREAM_COLORPRIMARIES m_colorPrimaries;
+    enum INPUTSTREAM_COLORTRC m_colorTransferCharacteristic;
+    //@}
+
+    //! @brief mastering static Metadata
+    struct INPUTSTREAM_MASTERING_METADATA* m_masteringMetadata;
+
+    //! @brief content light static Metadata
+    struct INPUTSTREAM_CONTENTLIGHT_METADATA* m_contentLightMetadata;
+  };
+
+  struct INPUTSTREAM_TIMES
+  {
+    time_t startTime;
+    double ptsStart;
+    double ptsBegin;
+    double ptsEnd;
+  };
+
+  /*!
+   * @brief "C" ABI Structures to transfer the methods from this to Kodi
+   */
+
+  // this are properties given to the addon on create
+  // at this time we have no parameters for the addon
+  typedef struct AddonProps_InputStream /* internal */
+  {
+    int dummy;
+  } AddonProps_InputStream;
+
+  typedef struct AddonToKodiFuncTable_InputStream /* internal */
+  {
+    KODI_HANDLE kodiInstance;
+    struct DEMUX_PACKET* (*allocate_demux_packet)(void* kodiInstance, int data_size);
+    struct DEMUX_PACKET* (*allocate_encrypted_demux_packet)(void* kodiInstance,
+                                                            unsigned int data_size,
+                                                            unsigned int encrypted_subsample_count);
+    void (*free_demux_packet)(void* kodiInstance, struct DEMUX_PACKET* packet);
+  } AddonToKodiFuncTable_InputStream;
+
+  struct AddonInstance_InputStream;
+  typedef struct KodiToAddonFuncTable_InputStream /* internal */
+  {
+    KODI_HANDLE addonInstance;
+
+    bool(__cdecl* open)(const struct AddonInstance_InputStream* instance,
+                        struct INPUTSTREAM_PROPERTY* props);
+    void(__cdecl* close)(const struct AddonInstance_InputStream* instance);
+    const char*(__cdecl* get_path_list)(const struct AddonInstance_InputStream* instance);
+    void(__cdecl* get_capabilities)(const struct AddonInstance_InputStream* instance,
+                                    struct INPUTSTREAM_CAPABILITIES* capabilities);
+
+    // IDemux
+    bool(__cdecl* get_stream_ids)(const struct AddonInstance_InputStream* instance,
+                                  struct INPUTSTREAM_IDS* ids);
+    bool(__cdecl* get_stream)(const struct AddonInstance_InputStream* instance,
+                              int streamid,
+                              struct INPUTSTREAM_INFO* info,
+                              KODI_HANDLE* demuxStream,
+                              KODI_HANDLE (*transfer_stream)(KODI_HANDLE handle,
+                                                             int streamId,
+                                                             struct INPUTSTREAM_INFO* stream));
+    void(__cdecl* enable_stream)(const struct AddonInstance_InputStream* instance,
+                                 int streamid,
+                                 bool enable);
+    bool(__cdecl* open_stream)(const struct AddonInstance_InputStream* instance, int streamid);
+    void(__cdecl* demux_reset)(const struct AddonInstance_InputStream* instance);
+    void(__cdecl* demux_abort)(const struct AddonInstance_InputStream* instance);
+    void(__cdecl* demux_flush)(const struct AddonInstance_InputStream* instance);
+    struct DEMUX_PACKET*(__cdecl* demux_read)(const struct AddonInstance_InputStream* instance);
+    bool(__cdecl* demux_seek_time)(const struct AddonInstance_InputStream* instance,
+                                   double time,
+                                   bool backwards,
+                                   double* startpts);
+    void(__cdecl* demux_set_speed)(const struct AddonInstance_InputStream* instance, int speed);
+    void(__cdecl* set_video_resolution)(const struct AddonInstance_InputStream* instance,
+                                        int width,
+                                        int height);
+
+    // IDisplayTime
+    int(__cdecl* get_total_time)(const struct AddonInstance_InputStream* instance);
+    int(__cdecl* get_time)(const struct AddonInstance_InputStream* instance);
+
+    // ITime
+    bool(__cdecl* get_times)(const struct AddonInstance_InputStream* instance,
+                             struct INPUTSTREAM_TIMES* times);
+
+    // IPosTime
+    bool(__cdecl* pos_time)(const struct AddonInstance_InputStream* instance, int ms);
+
+    int(__cdecl* read_stream)(const struct AddonInstance_InputStream* instance,
+                              uint8_t* buffer,
+                              unsigned int bufferSize);
+    int64_t(__cdecl* seek_stream)(const struct AddonInstance_InputStream* instance,
+                                  int64_t position,
+                                  int whence);
+    int64_t(__cdecl* position_stream)(const struct AddonInstance_InputStream* instance);
+    int64_t(__cdecl* length_stream)(const struct AddonInstance_InputStream* instance);
+    bool(__cdecl* is_real_time_stream)(const struct AddonInstance_InputStream* instance);
+
+    // IChapter
+    int(__cdecl* get_chapter)(const struct AddonInstance_InputStream* instance);
+    int(__cdecl* get_chapter_count)(const struct AddonInstance_InputStream* instance);
+    const char*(__cdecl* get_chapter_name)(const struct AddonInstance_InputStream* instance,
+                                           int ch);
+    int64_t(__cdecl* get_chapter_pos)(const struct AddonInstance_InputStream* instance, int ch);
+    bool(__cdecl* seek_chapter)(const struct AddonInstance_InputStream* instance, int ch);
+
+    int(__cdecl* block_size_stream)(const struct AddonInstance_InputStream* instance);
+  } KodiToAddonFuncTable_InputStream;
+
+  typedef struct AddonInstance_InputStream /* internal */
+  {
+    struct AddonProps_InputStream* props;
+    struct AddonToKodiFuncTable_InputStream* toKodi;
+    struct KodiToAddonFuncTable_InputStream* toAddon;
+  } AddonInstance_InputStream;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/CMakeLists.txt b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/CMakeLists.txt
new file mode 100644
index 0000000..9a22c44
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(HEADERS demux_packet.h
+            stream_codec.h
+            stream_constants.h
+            stream_crypto.h
+            timing_constants.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-dev-kit_include_kodi_c-api_addon-instance_inputstream)
+endif()
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/demux_packet.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/demux_packet.h
new file mode 100644
index 0000000..79686ab
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/demux_packet.h
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (C) 2005-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_DEMUXPACKET_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_DEMUXPACKET_H
+
+#include "timing_constants.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#define DEMUX_SPECIALID_STREAMINFO -10
+#define DEMUX_SPECIALID_STREAMCHANGE -11
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  struct DEMUX_CRYPTO_INFO;
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_Interface_DEMUX_PACKET struct DEMUX_PACKET
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_Interface
+  /// @brief **Demux packet**\n
+  /// To processed codec and demux inputstream stream.
+  ///
+  /// This part is in the "C" style in order to have better performance and
+  /// possibly to be used in "C" libraries.
+  ///
+  /// The structure should be created with @ref kodi::addon::CInstanceInputStream::AllocateDemuxPacket()
+  /// or @ref kodi::addon::CInstanceInputStream::AllocateEncryptedDemuxPacket()
+  /// and if not added to Kodi with @ref kodi::addon::CInstanceInputStream::FreeDemuxPacket()
+  /// be deleted again.
+  ///
+  /// Packages that have been given to Kodi and processed will then be deleted
+  /// by him.
+  ///
+  ///@{
+  struct DEMUX_PACKET
+  {
+    /// @brief Stream package which is given for decoding.
+    ///
+    /// @note Associated storage from here is created using
+    /// @ref kodi::addon::CInstanceInputStream::AllocateDemuxPacket()
+    /// or @ref kodi::addon::CInstanceInputStream::AllocateEncryptedDemuxPacket().
+    uint8_t* pData;
+
+    /// @brief Size of the package given at @ref pData.
+    int iSize;
+
+    /// @brief Identification of the stream.
+    int iStreamId;
+
+    /// @brief Identification of the associated demuxer, this can be identical
+    /// on several streams.
+    int64_t demuxerId;
+
+    /// @brief The group this data belongs to, used to group data from different
+    /// streams together.
+    int iGroupId;
+
+    //------------------------------------------
+
+    /// @brief Additional packet data that can be provided by the container.
+    ///
+    /// Packet can contain several types of side information.
+    ///
+    /// This is usually based on that of ffmpeg, see
+    /// [AVPacketSideData](https://ffmpeg.org/doxygen/trunk/structAVPacketSideData.html).
+    void* pSideData;
+
+    /// @brief Data elements stored at @ref pSideData.
+    int iSideDataElems;
+
+    //------------------------------------------
+
+    /// @brief Presentation time stamp (PTS).
+    double pts;
+
+    /// @brief Decoding time stamp (DTS).
+    double dts;
+
+    /// @brief Duration in @ref STREAM_TIME_BASE if available
+    double duration;
+
+    /// @brief Display time from input stream
+    int dispTime;
+
+    /// @brief To show that this package allows recreating the presentation by
+    /// mistake.
+    bool recoveryPoint;
+
+    //------------------------------------------
+
+    /// @brief Optional data to allow decryption at processing site if
+    /// necessary.
+    ///
+    /// This can be created using @ref kodi::addon::CInstanceInputStream::AllocateEncryptedDemuxPacket(),
+    /// otherwise this is declared as <b>`nullptr`</b>.
+    ///
+    /// See @ref DEMUX_CRYPTO_INFO for their style.
+    struct DEMUX_CRYPTO_INFO* cryptoInfo;
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_DEMUXPACKET_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/StreamCodec.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_codec.h
index e030371..b489cb9 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/StreamCodec.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_codec.h
@@ -6,7 +6,8 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCODEC_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCODEC_H
 
 #ifdef __cplusplus
 extern "C"
@@ -14,10 +15,12 @@ extern "C"
 #endif /* __cplusplus */
 
   //==============================================================================
-  /// @ingroup cpp_kodi_addon_videocodec_Defs_VIDEOCODEC_INITDATA
-  /// @brief The standard defines several sets of capabilities, which are referred
-  /// to as profiles, targeting specific classes of applications.
-  //@{
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption_STREAMCODEC_PROFILE enum STREAMCODEC_PROFILE
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_StreamCodec
+  /// @brief **The standard defines several sets of capabilities.**\n
+  /// Which are referred to as profiles, targeting specific classes of applications.
+  ///
+  ///@{
   enum STREAMCODEC_PROFILE
   {
     /// @brief Unknown codec profile
@@ -26,8 +29,8 @@ extern "C"
     /// @brief If a codec profile is not required
     CodecProfileNotNeeded,
 
-    /// @brief **H264** Baseline Profile (BP, 66)
-    ///
+    /// @brief **H264** Baseline Profile (BP, 66)\n
+    /// \n
     /// Primarily for low-cost applications that require additional data loss
     /// robustness, this profile is used in some videoconferencing and mobile
     /// applications. This profile includes all features that are supported
@@ -40,8 +43,8 @@ extern "C"
     /// profiles share the same profile identifier code value.
     H264CodecProfileBaseline,
 
-    /// @brief **H264** Main Profile (MP, 77)
-    ///
+    /// @brief **H264** Main Profile (MP, 77)\n
+    /// \n
     /// This profile is used for standard-definition digital TV broadcasts that
     /// use the MPEG-4 format as defined in the
     /// [DVB standard](http://www.etsi.org/deliver/etsi_ts/101100_101199/101154/01.09.01_60/ts_101154v010901p.pdf).
@@ -50,15 +53,15 @@ extern "C"
     /// in 2004 for that application.
     H264CodecProfileMain,
 
-    /// @brief **H264** Extended Profile (XP, 88)
-    ///
+    /// @brief **H264** Extended Profile (XP, 88)\n
+    /// \n
     /// Intended as the streaming video profile, this profile has relatively high
     /// compression capability and some extra tricks for robustness to data losses
     /// and server stream switching.
     H264CodecProfileExtended,
 
-    /// @brief **H264** High Profile (HiP, 100)
-    ///
+    /// @brief **H264** High Profile (HiP, 100)\n
+    /// \n
     /// The primary profile for broadcast and disc storage applications,
     /// particularly for high-definition television applications (for example,
     /// this is the profile adopted by the [Blu-ray Disc](https://en.wikipedia.org/wiki/Blu-ray_Disc)
@@ -66,31 +69,31 @@ extern "C"
     /// HDTV broadcast service).
     H264CodecProfileHigh,
 
-    /// @brief **H264** High 10 Profile (Hi10P, 110)
-    ///
+    /// @brief **H264** High 10 Profile (Hi10P, 110)\n
+    /// \n
     /// Going beyond typical mainstream consumer product capabilities, this
     /// profile builds on top of the High Profile, adding support for up to 10
     /// bits per sample of decoded picture precision.
     H264CodecProfileHigh10,
 
-    /// @brief **H264** High 4:2:2 Profile (Hi422P, 122)
-    ///
+    /// @brief **H264** High 4:2:2 Profile (Hi422P, 122)\n
+    /// \n
     /// Primarily targeting professional applications that use interlaced video,
     /// this profile builds on top of the High 10 Profile, adding support for the
     /// 4:2:2 chroma sampling format while using up to 10 bits per sample of
     /// decoded picture precision.
     H264CodecProfileHigh422,
 
-    /// @brief **H264** High 4:4:4 Predictive Profile (Hi444PP, 244)
-    ///
+    /// @brief **H264** High 4:4:4 Predictive Profile (Hi444PP, 244)\n
+    /// \n
     /// This profile builds on top of the High 4:2:2 Profile, supporting up to
     /// 4:4:4 chroma sampling, up to 14 bits per sample, and additionally
     /// supporting efficient lossless region coding and the coding of each
     /// picture as three separate color planes.
     H264CodecProfileHigh444Predictive,
 
-    /// @brief **VP9** profile 0
-    ///
+    /// @brief **VP9** profile 0\n
+    /// \n
     /// There are several variants of the VP9 format (known as "coding profiles"),
     /// which successively allow more features; profile 0 is the basic variant,
     /// requiring the least from a hardware implementation.
@@ -99,28 +102,30 @@ extern "C"
     /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0
     VP9CodecProfile0 = 20,
 
-    /// @brief **VP9** profile 1
-    ///
+    /// @brief **VP9** profile 1\n
+    /// \n
     /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 8 bit,
     /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0, 4:2:2, 4:4:4
     VP9CodecProfile1,
 
-    /// @brief **VP9** profile 2
-    ///
+    /// @brief **VP9** profile 2\n
+    /// \n
     /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 10–12 bit,
     /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0
     VP9CodecProfile2,
 
-    /// @brief **VP9** profile 3
-    ///
+    /// @brief **VP9** profile 3\n
+    /// \n
     /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 10–12 bit,
     /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0, 4:2:2, 4:4:4,
     /// see [VP9 Bitstream & Decoding Process Specification](https://storage.googleapis.com/downloads.webmproject.org/docs/vp9/vp9-bitstream-specification-v0.6-20160331-draft.pdf)
     VP9CodecProfile3,
   };
-  //@}
+  ///@}
   //------------------------------------------------------------------------------
 
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCODEC_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_constants.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_constants.h
new file mode 100644
index 0000000..f442d64
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_constants.h
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (C) 2017-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCONSTANTS_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCONSTANTS_H
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamConstants
+/// @brief The name of the inputstream add-on that should be used by Kodi to
+/// play the stream.
+///
+/// Leave blank to use  Kodi's built-in playing capabilities or to allow
+/// ffmpeg to handle directly set to @ref STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG.
+#define STREAM_PROPERTY_INPUTSTREAM "inputstream"
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamConstants
+/// @brief Identification string for an input stream.
+///
+/// This value can be used in addition to @ref STREAM_PROPERTY_INPUTSTREAM. It is
+/// used to provide the respective inpustream addon with additional
+/// identification.
+///
+/// The difference between this and other stream properties is that it is also
+/// passed in the associated @ref kodi::addon::CAddonBase::CreateInstance call.
+///
+/// This makes it possible to select different processing classes within the
+/// associated add-on.
+#define STREAM_PROPERTY_INPUTSTREAM_INSTANCE_ID "inputstream-instance-id"
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamConstants
+/// @brief "true" to denote that the stream that should be played is a
+/// realtime stream. Any other value indicates that this is not a realtime
+/// stream.
+#define STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream"
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamConstants
+/// @brief Special value for @ref STREAM_PROPERTY_INPUTSTREAM to use
+/// ffmpeg to directly play a stream URL.
+#define STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG "inputstream.ffmpeg"
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_StreamConstants
+/// @brief Max number of properties that can be sent to an Inputstream addon
+#define STREAM_MAX_PROPERTY_COUNT 30
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCONSTANTS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_crypto.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_crypto.h
new file mode 100644
index 0000000..4b60306
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/stream_crypto.h
@@ -0,0 +1,129 @@
+/*
+ *  Copyright (C) 2017-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCRYPTO_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCRYPTO_H
+
+#include <stdint.h>
+#include <string.h>
+
+#define STREAMCRYPTO_VERSION_LEVEL 2
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption_STREAM_CRYPTO_KEY_SYSTEM enum STREAM_CRYPTO_KEY_SYSTEM
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_StreamEncryption
+  /// @brief **Available ways to process stream cryptography**\n
+  /// For @ref cpp_kodi_addon_inputstream_Defs_StreamEncryption_StreamCryptoSession,
+  /// this defines the used and required auxiliary modules which are required to
+  /// process the encryption stream.
+  ///
+  /// Used to set wanted [digital rights management](https://en.wikipedia.org/wiki/Digital_rights_management)
+  /// (DRM) technology provider for stream.
+  ///@{
+  enum STREAM_CRYPTO_KEY_SYSTEM
+  {
+    /// @brief **0** - If no path is to be used, this is the default
+    STREAM_CRYPTO_KEY_SYSTEM_NONE = 0,
+
+    /// @brief **1** - To use [Widevine](https://en.wikipedia.org/wiki/Widevine) for processing
+    STREAM_CRYPTO_KEY_SYSTEM_WIDEVINE,
+
+    /// @brief **2** - To use [Playready](https://en.wikipedia.org/wiki/PlayReady) for processing
+    STREAM_CRYPTO_KEY_SYSTEM_PLAYREADY,
+
+    /// @brief **3** - To use Wiseplay for processing
+    STREAM_CRYPTO_KEY_SYSTEM_WISEPLAY,
+
+    /// @brief **4** - The maximum value to use in a list.
+    STREAM_CRYPTO_KEY_SYSTEM_COUNT
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption_STREAM_CRYPTO_FLAGS enum STREAM_CRYPTO_FLAGS
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_StreamEncryption
+  /// @brief **Cryptography flags to use special conditions**\n
+  /// To identify special extra conditions.
+  ///
+  /// @note These variables are bit flags which are created using "|" can be used
+  /// together.
+  ///
+  ///@{
+  enum STREAM_CRYPTO_FLAGS
+  {
+    /// @brief **0000 0000** - Empty to set if nothing is used.
+    STREAM_CRYPTO_FLAG_NONE = 0,
+
+    /// @brief **0000 0001** - Is set in flags if decoding has to be done in
+    /// [trusted execution environment (TEE)](https://en.wikipedia.org/wiki/Trusted_execution_environment).
+    STREAM_CRYPTO_FLAG_SECURE_DECODER = (1 << 0)
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_inputstream_Defs_StreamEncryption_DEMUX_CRYPTO_INFO struct DEMUX_CRYPTO_INFO
+  /// @ingroup cpp_kodi_addon_inputstream_Defs_StreamEncryption
+  /// @brief **C data structure for processing encrypted streams.**\n
+  /// If required, this structure is used for every DEMUX_PACKET to be processed.
+  ///
+  ///@{
+  struct DEMUX_CRYPTO_INFO
+  {
+    /// @brief Number of subsamples.
+    uint16_t numSubSamples;
+
+    /// @brief Flags for later use.
+    uint16_t flags;
+
+    /// @brief @ref numSubSamples uint16_t's wich define the size of clear size
+    /// of a subsample.
+    uint16_t* clearBytes;
+
+    /// @brief @ref numSubSamples uint32_t's wich define the size of cipher size
+    /// of a subsample.
+    uint32_t* cipherBytes;
+
+    /// @brief Initialization vector
+    uint8_t iv[16];
+
+    /// @brief Key id
+    uint8_t kid[16];
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  // Data to manage stream cryptography
+  struct STREAM_CRYPTO_SESSION
+  {
+    // keysystem for encrypted media, STREAM_CRYPTO_KEY_SYSTEM_NONE for unencrypted
+    // media.
+    //
+    // See STREAM_CRYPTO_KEY_SYSTEM for available options.
+    enum STREAM_CRYPTO_KEY_SYSTEM keySystem;
+
+    // Flags to use special conditions, see STREAM_CRYPTO_FLAGS for available flags.
+    uint8_t flags;
+
+    // The crypto session key id.
+    char sessionId[256];
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_STREAMCRYPTO_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/timing_constants.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/timing_constants.h
new file mode 100644
index 0000000..a226a0d
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/inputstream/timing_constants.h
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (C) 2015-2020 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_INPUTSTREAM_TIMINGCONSTANTS_H
+#define C_API_ADDONINSTANCE_INPUTSTREAM_TIMINGCONSTANTS_H
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Speed value to pause stream in playback.
+///
+#define STREAM_PLAYSPEED_PAUSE 0 // frame stepping
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Speed value to perform stream playback at normal speed.
+///
+/// See @ref STREAM_PLAYSPEED_PAUSE for pause of stream.
+///
+#define STREAM_PLAYSPEED_NORMAL 1000
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Time base represented as integer.
+///
+#define STREAM_TIME_BASE 1000000
+
+/// @ingroup cpp_kodi_addon_inputstream_Defs_TimingConstants
+/// @brief Undefined timestamp value.
+///
+/// Usually reported by demuxer that work on containers that do not provide
+/// either pts or dts.
+///
+#define STREAM_NOPTS_VALUE 0xFFF0000000000000
+
+// "C" defines to translate stream times
+#define STREAM_TIME_TO_MSEC(x) ((int)((double)(x)*1000 / STREAM_TIME_BASE))
+#define STREAM_SEC_TO_TIME(x) ((double)(x)*STREAM_TIME_BASE)
+#define STREAM_MSEC_TO_TIME(x) ((double)(x)*STREAM_TIME_BASE / 1000)
+
+#endif /* !C_API_ADDONINSTANCE_INPUTSTREAM_TIMINGCONSTANTS_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h
index 393f34a..df168bc 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/peripheral.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PERIPHERAL_H
 #define C_API_ADDONINSTANCE_PERIPHERAL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h
index a50ea2b..cc24e5d 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_H
 #define C_API_ADDONINSTANCE_PVR_H
 
@@ -67,7 +65,8 @@ extern "C"
   {
     const char* strUserPath;
     const char* strClientPath;
-    int iEpgMaxDays;
+    int iEpgMaxFutureDays;
+    int iEpgMaxPastDays;
   } AddonProperties_PVR;
 
   /*!
@@ -124,8 +123,8 @@ extern "C"
 
     //--==----==----==----==----==----==----==----==----==----==----==----==----==
     // Stream demux interface functions
-    void (*FreeDemuxPacket)(void* kodiInstance, struct DemuxPacket* pPacket);
-    struct DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
+    void (*FreeDemuxPacket)(void* kodiInstance, struct DEMUX_PACKET* pPacket);
+    struct DEMUX_PACKET* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
     struct PVR_CODEC (*GetCodecByName)(const void* kodiInstance, const char* strCodecName);
 
     //--==----==----==----==----==----==----==----==----==----==----==----==----==
@@ -210,7 +209,8 @@ extern "C"
                                                        const struct EPG_TAG*,
                                                        struct PVR_NAMED_VALUE*,
                                                        unsigned int*);
-    enum PVR_ERROR(__cdecl* SetEPGTimeFrame)(const struct AddonInstance_PVR*, int);
+    enum PVR_ERROR(__cdecl* SetEPGMaxPastDays)(const struct AddonInstance_PVR*, int);
+    enum PVR_ERROR(__cdecl* SetEPGMaxFutureDays)(const struct AddonInstance_PVR*, int);
     enum PVR_ERROR(__cdecl* CallEPGMenuHook)(const struct AddonInstance_PVR*,
                                              const struct PVR_MENUHOOK*,
                                              const struct EPG_TAG*);
@@ -295,7 +295,7 @@ extern "C"
     // Stream demux interface functions
     enum PVR_ERROR(__cdecl* GetStreamProperties)(const struct AddonInstance_PVR*,
                                                  struct PVR_STREAM_PROPERTIES*);
-    struct DemuxPacket*(__cdecl* DemuxRead)(const struct AddonInstance_PVR*);
+    struct DEMUX_PACKET*(__cdecl* DemuxRead)(const struct AddonInstance_PVR*);
     void(__cdecl* DemuxReset)(const struct AddonInstance_PVR*);
     void(__cdecl* DemuxAbort)(const struct AddonInstance_PVR*);
     void(__cdecl* DemuxFlush)(const struct AddonInstance_PVR*);
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
index a24d27f..f8213fb 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H
 #define C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
index 00daffa..a19fba1 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_CHANNELS_H
 #define C_API_ADDONINSTANCE_PVR_CHANNELS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
index 449000f..a765121 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_DEFINES_H
 #define C_API_ADDONINSTANCE_PVR_DEFINES_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
index e7cdf06..c74a113 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_EDL_H
 #define C_API_ADDONINSTANCE_PVR_EDL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
index d7512dc..2ed23cd 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_EPG_H
 #define C_API_ADDONINSTANCE_PVR_EPG_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
index e2136f6..b4470bb 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
@@ -6,19 +6,12 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_GENERAL_H
 #define C_API_ADDONINSTANCE_PVR_GENERAL_H
 
+#include "../inputstream/stream_constants.h"
 #include "pvr_defines.h"
 
-#ifdef BUILD_KODI_ADDON
-#include "../../../InputStreamConstants.h"
-#else
-#include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h"
-#endif
-
 #include <stdbool.h>
 
 //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
index 2ead263..e204311 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_MENUHOOK_H
 #define C_API_ADDONINSTANCE_PVR_MENUHOOK_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
index 2e2c081..0bbfe57 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_RECORDINGS_H
 #define C_API_ADDONINSTANCE_PVR_RECORDINGS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
index 1206c67..aaca30e 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
@@ -6,19 +6,12 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_STREAM_H
 #define C_API_ADDONINSTANCE_PVR_STREAM_H
 
+#include "../inputstream/demux_packet.h"
 #include "pvr_defines.h"
 
-#ifdef BUILD_KODI_ADDON
-#include "../../../DemuxPacket.h"
-#else
-#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
-#endif
-
 #include <stdint.h>
 #include <time.h>
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
index 209726d..a4b53d6 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_PVR_TIMERS_H
 #define C_API_ADDONINSTANCE_PVR_TIMERS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h
index 32cf6e1..90f971a 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/screensaver.h
@@ -6,7 +6,8 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
+#ifndef C_API_ADDONINSTANCE_SCREENSAVER_H
+#define C_API_ADDONINSTANCE_SCREENSAVER_H
 
 #include "../addon_base.h"
 
@@ -73,3 +74,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_SCREENSAVER_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h
index a6c3f44..7021c0f 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/vfs.h
@@ -5,8 +5,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDONINSTANCE_VFS_H
 #define C_API_ADDONINSTANCE_VFS_H
 
@@ -94,7 +92,7 @@ extern "C"
                                                 VFS_FILE_HANDLE context);
     bool(__cdecl* io_control_get_cache_status)(const struct AddonInstance_VFSEntry* instance,
                                                VFS_FILE_HANDLE context,
-                                               VFS_CACHE_STATUS_DATA* status);
+                                               struct VFS_CACHE_STATUS_DATA* status);
     bool(__cdecl* io_control_set_cache_rate)(const struct AddonInstance_VFSEntry* instance,
                                              VFS_FILE_HANDLE context,
                                              unsigned int rate);
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/video_codec.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/video_codec.h
new file mode 100644
index 0000000..02d8b06
--- /dev/null
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/video_codec.h
@@ -0,0 +1,261 @@
+/*
+ *  Copyright (C) 2017-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#ifndef C_API_ADDONINSTANCE_VIDEOCODEC_H
+#define C_API_ADDONINSTANCE_VIDEOCODEC_H
+
+#include "../addon_base.h"
+#include "inputstream/demux_packet.h"
+#include "inputstream/stream_codec.h"
+#include "inputstream/stream_crypto.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs
+  /// @brief Return values used by video decoder interface
+  enum VIDEOCODEC_RETVAL
+  {
+    /// @brief Noop
+    VC_NONE = 0,
+
+    /// @brief An error occured, no other messages will be returned
+    VC_ERROR,
+
+    /// @brief The decoder needs more data
+    VC_BUFFER,
+
+    /// @brief The decoder got a picture
+    VC_PICTURE,
+
+    /// @brief The decoder signals EOF
+    VC_EOF,
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata
+  /// @brief The video stream representations requested by Kodi
+  ///
+  enum VIDEOCODEC_FORMAT
+  {
+    /// @brief Unknown types, this is used to declare the end of a list of
+    /// requested types
+    VIDEOCODEC_FORMAT_UNKNOWN = 0,
+
+    /// @brief YV12 4:2:0 YCrCb planar format
+    VIDEOCODEC_FORMAT_YV12,
+
+    /// @brief These formats are identical to YV12 except that the U and V plane
+    /// order is reversed.
+    VIDEOCODEC_FORMAT_I420,
+
+    /// @brief The maximum value to use in a list.
+    VIDEOCODEC_FORMAT_MAXFORMATS
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VideoCodecInitdata
+  /// @brief Video codec types that can be requested from Kodi
+  ///
+  enum VIDEOCODEC_TYPE
+  {
+    /// @brief Unknown or other type requested
+    ///
+    VIDEOCODEC_UNKNOWN = 0,
+
+    /// @brief [VP8](https://en.wikipedia.org/wiki/VP8) video coding format
+    ///
+    VIDEOCODEC_VP8,
+
+    /// @brief [Advanced Video Coding (AVC)](https://en.wikipedia.org/wiki/Advanced_Video_Coding),
+    /// also referred to as H.264 or [MPEG-4](https://en.wikipedia.org/wiki/MPEG-4)
+    /// Part 10, Advanced Video Coding (MPEG-4 AVC).
+    VIDEOCODEC_H264,
+
+    /// @brief [VP9](https://en.wikipedia.org/wiki/VP9) video coding format\n
+    /// \n
+    /// VP9 is the successor to VP8 and competes mainly with MPEG's
+    /// [High Efficiency Video Coding](https://en.wikipedia.org/wiki/High_Efficiency_Video_Coding)
+    /// (HEVC/H.265).
+    VIDEOCODEC_VP9
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VIDEOCODEC_PICTURE
+  /// @brief YUV Plane identification pointers
+  ///
+  /// YUV is a color encoding system typically used as part of a color image pipeline.
+  ///
+  /// These are used to access stored data in @ref VIDEOCODEC_PICTURE::planeOffsets
+  /// and @ref VIDEOCODEC_PICTURE::stride.
+  ///
+  enum VIDEOCODEC_PLANE
+  {
+    /// @brief "luminance" component Y (equivalent to grey scale)
+    VIDEOCODEC_PICTURE_Y_PLANE = 0,
+
+    /// @brief "chrominance" component U (blue projection)
+    VIDEOCODEC_PICTURE_U_PLANE,
+
+    /// @brief "chrominance" component V (red projection)
+    VIDEOCODEC_PICTURE_V_PLANE,
+
+    /// @brief The maximum value to use in a list.
+    VIDEOCODEC_PICTURE_MAXPLANES = 3,
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VIDEOCODEC_PICTURE
+  /// @brief Video coded process flags, used to perform special operations in
+  /// stream calls.
+  ///
+  /// These are used to access stored data in @ref VIDEOCODEC_PICTURE::flags.
+  ///
+  /// @note These variables are bit flags which are created using "|" can be used together.
+  ///
+  enum VIDEOCODEC_PICTURE_FLAG
+  {
+    /// @brief Empty and nothing defined
+    VIDEOCODEC_PICTURE_FLAG_NONE = 0,
+
+    /// @brief Drop in decoder
+    VIDEOCODEC_PICTURE_FLAG_DROP = (1 << 0),
+
+    /// @brief Squeeze out pictured without feeding new packets
+    VIDEOCODEC_PICTURE_FLAG_DRAIN = (1 << 1),
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_videocodec_Defs_VIDEOCODEC_PICTURE struct VIDEOCODEC_PICTURE
+  /// @ingroup cpp_kodi_addon_videocodec_Defs
+  /// @brief Data structure which is given to the addon when a decoding call is made.
+  ///
+  ///@{
+  struct VIDEOCODEC_PICTURE
+  {
+    /// @brief The video format declared with @ref VIDEOCODEC_FORMAT and to be
+    /// used on the addon.
+    enum VIDEOCODEC_FORMAT videoFormat;
+
+    /// @brief Video coded process flags, used to perform special operations in
+    /// stream calls.
+    ///
+    /// Possible flags are declared here @ref VIDEOCODEC_PICTURE_FLAGS.
+    uint32_t flags;
+
+    /// @brief Picture width.
+    uint32_t width;
+
+    /// @brief Picture height.
+    uint32_t height;
+
+    /// @brief Data to be decoded in the addon.
+    uint8_t* decodedData;
+
+    /// @brief Size of the data given with @ref decodedData
+    size_t decodedDataSize;
+
+    /// @brief YUV color plane calculation array.
+    ///
+    /// This includes the three values of the YUV and can be identified using
+    /// @ref VIDEOCODEC_PLANE.
+    uint32_t planeOffsets[VIDEOCODEC_PICTURE_MAXPLANES];
+
+    /// @brief YUV color stride calculation array
+    ///
+    /// This includes the three values of the YUV and can be identified using
+    /// @ref VIDEOCODEC_PLANE.
+    uint32_t stride[VIDEOCODEC_PICTURE_MAXPLANES];
+
+    /// @brief Picture presentation time stamp (PTS).
+    int64_t pts;
+
+    /// @brief This is used to save the related handle from Kodi.
+    ///
+    /// To handle the input stream buffer, this is given by Kodi using
+    /// @ref kodi::addon::CInstanceVideoCodec::GetFrameBuffer and must be
+    /// released again using @ref kodi::addon::CInstanceVideoCodec::ReleaseFrameBuffer.
+    KODI_HANDLE videoBufferHandle; 
+  };
+  ///@}
+  //----------------------------------------------------------------------------
+
+  struct VIDEOCODEC_INITDATA
+  {
+    enum VIDEOCODEC_TYPE codec;
+    enum STREAMCODEC_PROFILE codecProfile;
+    enum VIDEOCODEC_FORMAT* videoFormats;
+    uint32_t width;
+    uint32_t height;
+    const uint8_t* extraData;
+    unsigned int extraDataSize;
+    struct STREAM_CRYPTO_SESSION cryptoSession;
+  };
+
+  // this are properties given to the addon on create
+  // at this time we have no parameters for the addon
+  typedef struct AddonProps_VideoCodec
+  {
+    int dummy;
+  } AddonProps_VideoCodec;
+
+  struct AddonInstance_VideoCodec;
+  typedef struct KodiToAddonFuncTable_VideoCodec
+  {
+    KODI_HANDLE addonInstance;
+
+    //! @brief Opens a codec
+    bool(__cdecl* open)(const struct AddonInstance_VideoCodec* instance,
+                        struct VIDEOCODEC_INITDATA* initData);
+
+    //! @brief Reconfigures a codec
+    bool(__cdecl* reconfigure)(const struct AddonInstance_VideoCodec* instance,
+                               struct VIDEOCODEC_INITDATA* initData);
+
+    //! @brief Feed codec if requested from GetPicture() (return VC_BUFFER)
+    bool(__cdecl* add_data)(const struct AddonInstance_VideoCodec* instance,
+                            const struct DEMUX_PACKET* packet);
+
+    //! @brief Get a decoded picture / request new data
+    enum VIDEOCODEC_RETVAL(__cdecl* get_picture)(const struct AddonInstance_VideoCodec* instance,
+                                                 struct VIDEOCODEC_PICTURE* picture);
+
+    //! @brief Get the name of this video decoder
+    const char*(__cdecl* get_name)(const struct AddonInstance_VideoCodec* instance);
+
+    //! @brief Reset the codec
+    void(__cdecl* reset)(const struct AddonInstance_VideoCodec* instance);
+  } KodiToAddonFuncTable_VideoCodec;
+
+  typedef struct AddonToKodiFuncTable_VideoCodec
+  {
+    KODI_HANDLE kodiInstance;
+    bool (*get_frame_buffer)(void* kodiInstance, struct VIDEOCODEC_PICTURE* picture);
+    void (*release_frame_buffer)(void* kodiInstance, void* buffer);
+  } AddonToKodiFuncTable_VideoCodec;
+
+  typedef struct AddonInstance_VideoCodec
+  {
+    struct AddonProps_VideoCodec* props;
+    struct AddonToKodiFuncTable_VideoCodec* toKodi;
+    struct KodiToAddonFuncTable_VideoCodec* toAddon;
+  } AddonInstance_VideoCodec;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_VIDEOCODEC_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h
index 913aad8..616e0a8 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/visualization.h
@@ -6,7 +6,8 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
+#ifndef C_API_ADDONINSTANCE_VISUALIZATION_H
+#define C_API_ADDONINSTANCE_VISUALIZATION_H
 
 #include "../addon_base.h"
 
@@ -115,3 +116,5 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
+
+#endif /* !C_API_ADDONINSTANCE_VISUALIZATION_H */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h
index faa99fa..1153eca 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon_base.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_ADDON_BASE_H
 #define C_API_ADDON_BASE_H
 
@@ -27,6 +25,8 @@
 #endif
 #endif
 
+// Generic helper definitions for smallest possible alignment
+//@{
 #undef ATTRIBUTE_PACKED
 #undef PRAGMA_PACK_BEGIN
 #undef PRAGMA_PACK_END
@@ -34,18 +34,16 @@
 #if defined(__GNUC__)
 #define ATTRIBUTE_PACKED __attribute__((packed))
 #define PRAGMA_PACK 0
-#define ATTRIBUTE_HIDDEN __attribute__((visibility("hidden")))
 #endif
 
 #if !defined(ATTRIBUTE_PACKED)
 #define ATTRIBUTE_PACKED
 #define PRAGMA_PACK 1
 #endif
+//@}
 
-#if !defined(ATTRIBUTE_HIDDEN)
-#define ATTRIBUTE_HIDDEN
-#endif
-
+// Generic helper definitions for inline function support
+//@{
 #ifdef _MSC_VER
 #define ATTRIBUTE_FORCEINLINE __forceinline
 #elif defined(__GNUC__)
@@ -59,6 +57,27 @@
 #else
 #define ATTRIBUTE_FORCEINLINE inline
 #endif
+//@}
+
+// Generic helper definitions for shared library support
+//@{
+#if defined _WIN32 || defined __CYGWIN__
+#define ATTRIBUTE_DLL_IMPORT __declspec(dllimport)
+#define ATTRIBUTE_DLL_EXPORT __declspec(dllexport)
+#define ATTRIBUTE_DLL_LOCAL
+#else
+#if __GNUC__ >= 4
+#define ATTRIBUTE_DLL_IMPORT __attribute__ ((visibility ("default")))
+#define ATTRIBUTE_DLL_EXPORT __attribute__ ((visibility ("default")))
+#define ATTRIBUTE_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
+#else
+#define ATTRIBUTE_DLL_IMPORT
+#define ATTRIBUTE_DLL_EXPORT
+#define ATTRIBUTE_DLL_LOCAL
+#endif
+#endif
+#define ATTRIBUTE_HIDDEN ATTRIBUTE_DLL_LOCAL // Fallback to old
+//@}
 
 // Hardware specific device context interface
 #define ADDON_HARDWARE_CONTEXT void*
@@ -75,9 +94,11 @@ extern "C"
 #endif /* __cplusplus */
 
   //============================================================================
-  /// @ingroup cpp_kodi_addon_addonbase
-  /// @brief Return value of functions in @ref cpp_kodi_addon_addonbase "kodi::addon::CAddonBase"
-  /// and associated classes.
+  /// @ingroup cpp_kodi_addon_addonbase_Defs
+  /// @defgroup cpp_kodi_addon_addonbase_Defs_ADDON_STATUS enum ADDON_STATUS
+  /// @brief <b>Return value of functions in @ref cpp_kodi_addon_addonbase "kodi::addon::CAddonBase"
+  /// and associated classes</b>\n
+  /// With this Kodi can do any follow-up work or add-on e.g. declare it as defective.
   ///
   ///@{
   typedef enum ADDON_STATUS
@@ -211,7 +232,7 @@ extern "C"
   typedef struct KodiToAddonFuncTable_Addon
   {
     void (*destroy)();
-    ADDON_STATUS (*get_status)();
+    ADDON_STATUS (*get_status)(); // TODO unused remove by next min version increase
     ADDON_STATUS(*create_instance)
     (int instanceType,
      const char* instanceID,
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h
index 97510f7..dcb004c 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/audio_engine.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_AUDIO_ENGINE_H
 #define C_API_AUDIO_ENGINE_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h
index 70f9400..4290cb9 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/filesystem.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_FILESYSTEM_H
 #define C_API_FILESYSTEM_H
 
@@ -106,16 +104,15 @@ extern "C"
   /// @brief **CURL message types**\n
   /// Used on kodi::vfs::CFile::CURLAddOption().
   ///
-  //@{
+  ///@{
   typedef enum CURLOptiontype
   {
     /// @brief Set a general option.
     ADDON_CURL_OPTION_OPTION,
 
-    /// @brief Set a protocol option.
-    ///
+    /// @brief Set a protocol option.\n
+    ///\n
     /// The following names for *ADDON_CURL_OPTION_PROTOCOL* are possible:
-    ///
     /// | Option name                         | Description
     /// |------------------------------------:|:--------------------------------
     /// | <b>`accept-charset`</b>             | Set the "accept-charset" header
@@ -140,7 +137,7 @@ extern "C"
     /// @brief Add a Header
     ADDON_CURL_OPTION_HEADER
   } CURLOptiontype;
-  //@}
+  ///@}
   //----------------------------------------------------------------------------
 
   //============================================================================
@@ -151,7 +148,7 @@ extern "C"
   ///
   /// Used on kodi::vfs::CFile::GetPropertyValue() and kodi::vfs::CFile::GetPropertyValues().
   ///
-  //@{
+  ///@{
   typedef enum FilePropertyTypes
   {
     /// @brief Get protocol response line.
@@ -167,7 +164,7 @@ extern "C"
     /// @brief Get file effective URL (last one if redirected).
     ADDON_FILE_PROPERTY_EFFECTIVE_URL
   } FilePropertyTypes;
-  //@}
+  ///@}
   //----------------------------------------------------------------------------
 
   //}}}
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h
index 12afd02..8518a96 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/general.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GENERAL_H
 #define C_API_GENERAL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h
index 84fd822..46de262 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/button.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_BUTTON_H
 #define C_API_GUI_CONTROLS_BUTTON_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h
index ca38b27..571c7ce 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/edit.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_EDIT_H
 #define C_API_GUI_CONTROLS_EDIT_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h
index fea014b..dab4574 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/fade_label.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_FADE_LABEL_H
 #define C_API_GUI_CONTROLS_FADE_LABEL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h
index 4a46e6d..257dd67 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/image.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_IMAGE_H
 #define C_API_GUI_CONTROLS_IMAGE_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h
index d8a9fe4..92af25c 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/label.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_LABEL_H
 #define C_API_GUI_CONTROLS_LABEL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h
index 88638e0..4f211fd 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/progress.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_PROGRESS_H
 #define C_API_GUI_CONTROLS_PROGRESS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h
index a672d95..d652e67 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/radio_button.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_RADIO_BUTTON_H
 #define C_API_GUI_CONTROLS_RADIO_BUTTON_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h
index d4053a6..792a8d6 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/rendering.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_RENDERING_H
 #define C_API_GUI_CONTROLS_RENDERING_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h
index 2cbc972..4299252 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/settings_slider.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_SETTINGS_SLIDER_H
 #define C_API_GUI_CONTROLS_SETTINGS_SLIDER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h
index 0a67208..67c6c2f 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/slider.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_SLIDER_H
 #define C_API_GUI_CONTROLS_SLIDER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h
index d5e5c86..0373636 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/spin.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_SPIN_H
 #define C_API_GUI_CONTROLS_SPIN_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h
index 276d04c..333689e 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/controls/text_box.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_CONTROLS_TEXT_BOX_H
 #define C_API_GUI_CONTROLS_TEXT_BOX_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h
index ec60bc2..f0ea9a2 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/definitions.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DEFINITIONS_H
 #define C_API_GUI_DEFINITIONS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h
index 8bb5370..130d831 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/context_menu.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_CONTEXT_MENU_H
 #define C_API_GUI_DIALOGS_CONTEXT_MENU_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h
index e53588f..0992d5c 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/extended_progress.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_EXTENDED_PROGRESS_H
 #define C_API_GUI_DIALOGS_EXTENDED_PROGRESS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h
index 7ae4fac..ef3945b 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/filebrowser.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_FILEBROWSER_H
 #define C_API_GUI_DIALOGS_FILEBROWSER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h
index fc3c34c..f84dc20 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/keyboard.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_KEYBOARD_H
 #define C_API_GUI_DIALOGS_KEYBOARD_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h
index df23cd7..08aaf25 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/numeric.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_NUMERIC_H
 #define C_API_GUI_DIALOGS_NUMERIC_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h
index 9f37051..45fe0fc 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/ok.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_OK_H
 #define C_API_GUI_DIALOGS_OK_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h
index f1c8972..60a003a 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/progress.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_PROGRESS_H
 #define C_API_GUI_DIALOGS_PROGRESS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h
index 41ab82f..79635d7 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/select.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_SELECT_H
 #define C_API_GUI_DIALOGS_SELECT_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h
index eb38b0b..4a1cfe6 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/text_viewer.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_TEXT_VIEWER_H
 #define C_API_GUI_DIALOGS_TEXT_VIEWER_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h
index 01ed806..8558acb 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/dialogs/yes_no.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_DIALOGS_YES_NO_H
 #define C_API_GUI_DIALOGS_YES_NO_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h
index d0d256c..6769867 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/general.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_GENERAL_H
 #define C_API_GUI_GENERAL_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
index 274f3d9..5d62587 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/input/action_ids.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_ACTION_IDS_H
 #define C_API_GUI_ACTION_IDS_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h
index f0c4dc7..d2120ac 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/list_item.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_LIST_ITEM_H
 #define C_API_GUI_LIST_ITEM_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h
index 0f844f5..d7181c0 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/gui/window.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_GUI_WINDOW_H
 #define C_API_GUI_WINDOW_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h
index 88d5231..8bd987b 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/network.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_NETWORK_H
 #define C_API_NETWORK_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h
index 568a2fd..09d8c8c 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/platform/android/system.h
@@ -6,8 +6,6 @@
  *  See LICENSES/README.md for more information.
  */
 
-#pragma once
-
 #ifndef C_API_PLATFORM_ANDROID_H
 #define C_API_PLATFORM_ANDROID_H
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
index 3066b3c..10fa6ef 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
@@ -451,7 +451,7 @@ public:
   /// @param[in] item List item to add
   /// @param[in] itemPosition [opt] The position for item, default is on end
   ///
-  void AddListItem(std::shared_ptr<CListItem> item, int itemPosition = -1)
+  void AddListItem(const std::shared_ptr<CListItem>& item, int itemPosition = -1)
   {
     m_interface->kodi_gui->window->add_list_item(m_interface->kodiBase, m_controlHandle,
                                                  item->m_controlHandle, itemPosition);
@@ -465,7 +465,7 @@ public:
   /// @param[in] item List item to add
   /// @param[in] itemPosition [opt] The position for item, default is on end
   ///
-  void AddListItem(const std::string item, int itemPosition = -1)
+  void AddListItem(const std::string& item, int itemPosition = -1)
   {
     m_interface->kodi_gui->window->add_list_item(
         m_interface->kodiBase, m_controlHandle,
@@ -492,7 +492,7 @@ public:
   ///
   /// @param[in] item List item control class to remove
   ///
-  void RemoveListItem(std::shared_ptr<CListItem> item)
+  void RemoveListItem(const std::shared_ptr<CListItem>& item)
   {
     m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle,
                                                     item->m_controlHandle);
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
index 42a86f3..dc89740 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -33,7 +33,7 @@ namespace dialogs
 /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
 /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
 ///
-/// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
+/// It has the header @ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
 /// be included to enjoy it.
 ///
 namespace TextViewer
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
index 4dd97af..5d4e384 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
@@ -10,6 +10,8 @@
 
 #ifdef __cplusplus
 
+#if defined(WIN32) && defined(HAS_ANGLE)
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <angle_gl.h>
@@ -386,4 +388,8 @@ using CRenderHelper = gl::CGLonDX;
 } /* namespace gui */
 } /* namespace kodi */
 
+#else /* defined(WIN32) && defined(HAS_ANGLE) */
+#pragma message ( "WARNING: GLonDX.h only be available on Windows by use of Angle as depend!" )
+#endif /* defined(WIN32) && defined(HAS_ANGLE) */
+
 #endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
index dabe101..b08f898 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
@@ -67,7 +67,7 @@ inline std::shared_ptr<IRenderHelper> ATTRIBUTE_HIDDEN GetRenderHelper()
   if (static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper)
     return static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper;
 
-  const std::shared_ptr<kodi::gui::IRenderHelper> renderHelper(new CRenderHelper());
+  std::shared_ptr<kodi::gui::IRenderHelper> renderHelper(new CRenderHelper());
   if (!renderHelper->Init())
     return nullptr;
 
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-dev-kit/include/kodi/versions.h
index e632f5a..e3431eb 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/versions.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#ifndef KODI_VERSIONS_H
+#define KODI_VERSIONS_H
+
 #include <string.h>
 
 #define STR_HELPER(x) #x
@@ -34,7 +37,7 @@
 // because cmake uses this area in this form to perform its addon dependency
 // check.
 // clang-format off
-#define ADDON_GLOBAL_VERSION_MAIN                     "1.2.4"
+#define ADDON_GLOBAL_VERSION_MAIN                     "1.3.0"
 #define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.2.0"
 #define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
 #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
@@ -104,10 +107,21 @@
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.3.4"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.3.4"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "3.0.1"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "3.0.1"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "c-api/addon-instance/inputstream.h" \
+                                                      "c-api/addon-instance/inputstream/demux_packet.h" \
+                                                      "c-api/addon-instance/inputstream/stream_codec.h" \
+                                                      "c-api/addon-instance/inputstream/stream_constants.h" \
+                                                      "c-api/addon-instance/inputstream/stream_crypto.h" \
+                                                      "c-api/addon-instance/inputstream/timing_constants.h" \
+                                                      "addon-instance/Inputstream.h" \
+                                                      "addon-instance/inputstream/DemuxPacket.h" \
+                                                      "addon-instance/inputstream/StreamCodec.h" \
+                                                      "addon-instance/inputstream/StreamConstants.h" \
+                                                      "addon-instance/inputstream/StreamCrypto.h" \
+                                                      "addon-instance/inputstream/TimingConstants.h"
 
 #define ADDON_INSTANCE_VERSION_PERIPHERAL             "2.0.0"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "2.0.0"
@@ -115,8 +129,8 @@
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
                                                       "addon-instance/PeripheralUtils.h"
 
-#define ADDON_INSTANCE_VERSION_PVR                    "7.0.1"
-#define ADDON_INSTANCE_VERSION_PVR_MIN                "7.0.0"
+#define ADDON_INSTANCE_VERSION_PVR                    "7.1.0"
+#define ADDON_INSTANCE_VERSION_PVR_MIN                "7.1.0"
 #define ADDON_INSTANCE_VERSION_PVR_XML_ID             "kodi.binary.instance.pvr"
 #define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "c-api/addon-instance/pvr.h" \
                                                       "c-api/addon-instance/pvr/pvr_channel_groups.h" \
@@ -158,24 +172,30 @@
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "addon-instance/Visualization.h" \
                                                       "c-api/addon-instance/visualization.h"
 
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.4"
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.4"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "2.0.2"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "2.0.1"
 #define ADDON_INSTANCE_VERSION_VIDEOCODEC_XML_ID      "kodi.binary.instance.videocodec"
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "addon-instance/VideoCodec.h" \
-                                                      "StreamCodec.h" \
-                                                      "StreamCrypto.h"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "c-api/addon-instance/video_codec.h" \
+                                                      "c-api/addon-instance/inputstream/stream_codec.h" \
+                                                      "c-api/addon-instance/inputstream/stream_crypto.h" \
+                                                      "addon-instance/VideoCodec.h" \
+                                                      "addon-instance/inputstream/StreamCodec.h" \
+                                                      "addon-instance/inputstream/StreamCrypto.h" \
 // clang-format on
 
 //==============================================================================
-///
-/// @ingroup cpp_kodi_addon_addonbase
-/// The currently available instance types for Kodi add-ons
+/// @ingroup cpp_kodi_addon_addonbase_Defs
+/// @defgroup cpp_kodi_addon_addonbase_Defs_ADDON_TYPE enum ADDON_TYPE
+/// **The currently available instance types for Kodi add-ons**\n
+/// This identifies the associated API part on the interface in Kodi and in the
+/// addon.
 ///
 /// \internal
 /// @note For add of new types take a new number on end. To change
 /// existing numbers can be make problems on already compiled add-ons.
 /// \endinternal
 ///
+///@{
 typedef enum ADDON_TYPE
 {
   /* addon global parts */
@@ -192,39 +212,40 @@ typedef enum ADDON_TYPE
 
   /* addon type instances */
 
-  /// Audio decoder instance, see \ref cpp_kodi_addon_audiodecoder "kodi::addon::CInstanceAudioDecoder"
+  /// Audio decoder instance, see @ref cpp_kodi_addon_audiodecoder "kodi::addon::CInstanceAudioDecoder"
   ADDON_INSTANCE_AUDIODECODER = 102,
 
-  /// Audio encoder instance, see \ref cpp_kodi_addon_audioencoder "kodi::addon::CInstanceAudioEncoder"
+  /// Audio encoder instance, see @ref cpp_kodi_addon_audioencoder "kodi::addon::CInstanceAudioEncoder"
   ADDON_INSTANCE_AUDIOENCODER = 103,
 
-  /// Game instance, see \ref cpp_kodi_addon_game "kodi::addon::CInstanceGame"
+  /// Game instance, see @ref cpp_kodi_addon_game "kodi::addon::CInstanceGame"
   ADDON_INSTANCE_GAME = 104,
 
-  /// Input stream instance, see \ref cpp_kodi_addon_inputstream "kodi::addon::CInstanceInputStream"
+  /// Input stream instance, see @ref cpp_kodi_addon_inputstream "kodi::addon::CInstanceInputStream"
   ADDON_INSTANCE_INPUTSTREAM = 105,
 
-  /// Peripheral instance, see \ref cpp_kodi_addon_peripheral "kodi::addon::CInstancePeripheral"
+  /// Peripheral instance, see @ref cpp_kodi_addon_peripheral "kodi::addon::CInstancePeripheral"
   ADDON_INSTANCE_PERIPHERAL = 106,
 
-  /// Game instance, see \ref cpp_kodi_addon_pvr "kodi::addon::CInstancePVRClient"
+  /// Game instance, see @ref cpp_kodi_addon_pvr "kodi::addon::CInstancePVRClient"
   ADDON_INSTANCE_PVR = 107,
 
-  /// PVR client instance, see \ref cpp_kodi_addon_screensaver "kodi::addon::CInstanceScreensaver"
+  /// PVR client instance, see @ref cpp_kodi_addon_screensaver "kodi::addon::CInstanceScreensaver"
   ADDON_INSTANCE_SCREENSAVER = 108,
 
-  /// Music visualization instance, see \ref cpp_kodi_addon_visualization "kodi::addon::CInstanceVisualization"
+  /// Music visualization instance, see @ref cpp_kodi_addon_visualization "kodi::addon::CInstanceVisualization"
   ADDON_INSTANCE_VISUALIZATION = 109,
 
-  /// Virtual Filesystem (VFS) instance, see \ref cpp_kodi_addon_vfs "kodi::addon::CInstanceVFS"
+  /// Virtual Filesystem (VFS) instance, see @ref cpp_kodi_addon_vfs "kodi::addon::CInstanceVFS"
   ADDON_INSTANCE_VFS = 110,
 
-  /// Image Decoder instance, see \ref cpp_kodi_addon_imagedecoder "kodi::addon::CInstanceImageDecoder"
+  /// Image Decoder instance, see @ref cpp_kodi_addon_imagedecoder "kodi::addon::CInstanceImageDecoder"
   ADDON_INSTANCE_IMAGEDECODER = 111,
 
-  /// Video Decoder instance, see \ref cpp_kodi_addon_videocodec "kodi::addon::CInstanceVideoCodec"
+  /// Video Decoder instance, see @ref cpp_kodi_addon_videocodec "kodi::addon::CInstanceVideoCodec"
   ADDON_INSTANCE_VIDEOCODEC = 112,
 } ADDON_TYPE;
+///@}
 //------------------------------------------------------------------------------
 
 #ifdef __cplusplus
@@ -490,3 +511,5 @@ inline int GetTypeId(const char* name)
 } /* namespace kodi */
 } /* extern "C" */
 #endif
+
+#endif /* !KODI_VERSIONS_H */
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index f0bec16..3621beb 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-JSONRPC_VERSION 11.15.0
+JSONRPC_VERSION 12.2.1