Merge pull request xbmc#27431 from quietvoid/dovi-zero-level5

[Android] [webOS] Add Dolby Vision setting to set zero L5 metadata

Author: sundermann

addons/resource.language.en_gb/resources/strings.po

@@ -24358,7 +24358,19 @@ msgctxt "#39208"
 msgid "Starfish is the hardware video decoder for LG's webOS. Disable it for troubleshooting or testing."
 msgstr ""
 
-#empty strings from id 39209 to 39999
+#. Title of Dolby Vision level 5 metadata zero override setting
+#: system/settings/settings.xml
+msgctxt "#39209"
+msgid "Dolby Vision: Override level 5 metadata to zero"
+msgstr ""
+
+#. Help text for setting "Dolby Vision: Override level 5 metadata to zero" of label #39209
+#: system/settings/settings.xml
+msgctxt "#39210"
+msgid "If enabled, Dolby Vision files will have level 5 (active area) metadata overridden to zero offsets. Enable if your display has issues with incorrectly cropped image in Dolby Vision playback."
+msgstr ""
+
+#empty strings from id 39211 to 39999
 
 # 40000 to 40800 are reserved for Video Versions feature
 

system/settings/settings.xml

@@ -241,6 +241,25 @@
             <hidevalue>false</hidevalue>
           </control>
         </setting>
+        <setting id="videoplayer.dovizerolevel5" type="boolean" label="39209" help="39210">
+          <requirement><!-- Android and webOS use CBitstreamConverter -->
+            <or>
+              <condition>HAS_MEDIACODEC</condition>
+              <condition>HAVE_WEBOS</condition>
+            </or>
+          </requirement>
+          <dependencies>
+            <dependency type="visible">
+              <or>
+                <condition on="property" name="supportsdolbyvision" />
+                <condition>HAVE_WEBOS</condition>
+              </or>
+            </dependency>
+          </dependencies>
+          <level>2</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
       </group>
       <group id="4" label="14232">
         <setting id="videoplayer.stereoscopicplaybackmode" type="integer" label="36520" help="36537">

xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp

@@ -500,10 +500,12 @@ bool CDVDVideoCodecAndroidMediaCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptio
       bool convertDovi{false};
       bool removeDovi{false};
       bool removeHdr10Plus{false};
+      bool doviZeroLevel5{false};
 
       if (settings)
       {
         convertDovi = settings->GetBool(CSettings::SETTING_VIDEOPLAYER_CONVERTDOVI);
+        doviZeroLevel5 = settings->GetBool(CSettings::SETTING_VIDEOPLAYER_DOVIZEROLEVEL5);
 
         const std::shared_ptr<CSettingList> allowedHdrFormatsSetting(
             std::dynamic_pointer_cast<CSettingList>(
@@ -600,6 +602,7 @@ bool CDVDVideoCodecAndroidMediaCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptio
         {
           m_bitstream->SetRemoveDovi(removeDovi);
           m_bitstream->SetRemoveHdr10Plus(removeHdr10Plus);
+          m_bitstream->SetDoviZeroLevel5(doviZeroLevel5);
 
           // Only set for profile 7, container hint allows to skip parsing unnecessarily
           if (m_hints.dovi.dv_profile == 7)

xbmc/cores/VideoPlayer/MediaPipelineWebOS.cpp

@@ -846,6 +846,7 @@ void CMediaPipelineWebOS::SetupBitstreamConverter(CDVDStreamInfo& hint)
   const std::shared_ptr<CSettings> settings = CServiceBroker::GetSettingsComponent()->GetSettings();
   const bool convertDovi =
       hint.dovi.el_present_flag || settings->GetBool(CSettings::SETTING_VIDEOPLAYER_CONVERTDOVI);
+  const bool doviZeroLevel5 = settings->GetBool(CSettings::SETTING_VIDEOPLAYER_DOVIZEROLEVEL5);
 
   const std::shared_ptr allowedHdrFormatsSetting(std::dynamic_pointer_cast<CSettingList>(
       settings->GetSetting(CSettings::SETTING_VIDEOPLAYER_ALLOWEDHDRFORMATS)));
@@ -864,6 +865,7 @@ void CMediaPipelineWebOS::SetupBitstreamConverter(CDVDStreamInfo& hint)
         if (hint.codec == AV_CODEC_ID_HEVC)
         {
           m_bitstream->SetRemoveDovi(removeDovi);
+          m_bitstream->SetDoviZeroLevel5(doviZeroLevel5);
 
           // webOS doesn't support HDR10+ and it can cause issues
           m_bitstream->SetRemoveHdr10Plus(true);

xbmc/settings/Settings.h

@@ -137,6 +137,7 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC
   static constexpr auto SETTING_VIDEOPLAYER_SUPPORTMVC = "videoplayer.supportmvc";
   static constexpr auto SETTING_VIDEOPLAYER_CONVERTDOVI = "videoplayer.convertdovi";
   static constexpr auto SETTING_VIDEOPLAYER_ALLOWEDHDRFORMATS = "videoplayer.allowedhdrformats";
+  static constexpr auto SETTING_VIDEOPLAYER_DOVIZEROLEVEL5 = "videoplayer.dovizerolevel5";
   static constexpr auto SETTING_VIDEOPLAYER_QUEUETIMESIZE = "videoplayer.queuetimesize";
   static constexpr auto SETTING_VIDEOPLAYER_QUEUEDATASIZE = "videoplayer.queuedatasize";
   static constexpr auto SETTING_MYVIDEOS_SELECTACTION = "myvideos.selectaction";

xbmc/utils/BitstreamConverter.cpp

@@ -22,9 +22,6 @@
 extern "C"
 {
 #include <libavutil/intreadwrite.h>
-#ifdef HAVE_LIBDOVI
-#include <libdovi/rpu_parser.h>
-#endif
 }
 
 enum {
@@ -264,32 +261,6 @@ static bool has_sei_recovery_point(const uint8_t *p, const uint8_t *end)
   return false;
 }
 
-#ifdef HAVE_LIBDOVI
-// The returned data must be freed with `dovi_data_free`
-// May be NULL if no conversion was done
-static const DoviData* convert_dovi_rpu_nal(uint8_t* buf, uint32_t nal_size)
-{
-  DoviRpuOpaque* rpu = dovi_parse_unspec62_nalu(buf, nal_size);
-  const DoviRpuDataHeader* header = dovi_rpu_get_header(rpu);
-  const DoviData* rpu_data = NULL;
-
-  if (header && header->guessed_profile == 7)
-  {
-    int ret = dovi_convert_rpu_with_mode(rpu, 2);
-    if (ret < 0)
-      goto done;
-
-    rpu_data = dovi_write_unspec62_nalu(rpu);
-  }
-
-done:
-  dovi_rpu_free_header(header);
-  dovi_rpu_free(rpu);
-
-  return rpu_data;
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////
 CBitstreamParser::CBitstreamParser() = default;
@@ -358,6 +329,7 @@ CBitstreamConverter::CBitstreamConverter()
   m_convert_dovi = false;
   m_removeDovi = false;
   m_removeHdr10Plus = false;
+  m_setDoviZeroLevel5 = false;
 }
 
 CBitstreamConverter::~CBitstreamConverter()
@@ -1005,21 +977,21 @@ bool CBitstreamConverter::BitstreamConvert(uint8_t* pData, int iSize, uint8_t **
         }
       }
 
-      if (write_buf && m_convert_dovi)
+      if (write_buf)
       {
         if (unit_type == HEVC_NAL_UNSPEC62)
         {
 #ifdef HAVE_LIBDOVI
           // Convert the RPU itself
-          rpu_data = convert_dovi_rpu_nal(buf, nal_size);
+          rpu_data = processDoviRpu(buf, nal_size);
           if (rpu_data)
           {
             buf_to_write = rpu_data->data;
             final_nal_size = rpu_data->len;
           }
 #endif
         }
-        else if (unit_type == HEVC_NAL_UNSPEC63)
+        else if (m_convert_dovi && unit_type == HEVC_NAL_UNSPEC63)
         {
           // Ignore the enhancement layer, may or may not help
           write_buf = false;
@@ -1334,3 +1306,50 @@ bool CBitstreamConverter::mpeg2_sequence_header(const uint8_t *data, const uint3
   return changed;
 }
 
+#ifdef HAVE_LIBDOVI
+// Processes Dolby Vision RPU
+//   - Converts to profile 8.1 if `m_convert_dovi` is enabled
+//   - Sets level 5 metadata to 0 offsets if `m_setDoviZeroLevel5` is enabled
+//
+// The returned data must be freed with `dovi_data_free`
+// May be NULL if no processing was done or if parsing errored
+const DoviData* CBitstreamConverter::processDoviRpu(uint8_t* buf, uint32_t nalSize)
+{
+  // early exit if no processing option is enabled
+  if (!m_convert_dovi && !m_setDoviZeroLevel5)
+    return NULL;
+
+  DoviRpuOpaque* rpu = dovi_parse_unspec62_nalu(buf, nalSize);
+  const DoviRpuDataHeader* header = dovi_rpu_get_header(rpu);
+  const DoviData* rpuData = NULL;
+
+  int ret = 0;
+  bool processed = false;
+
+  if (!header)
+  {
+    dovi_rpu_free(rpu);
+    return rpuData;
+  }
+
+  if (m_convert_dovi && header->guessed_profile == 7)
+  {
+    ret = dovi_convert_rpu_with_mode(rpu, 2);
+    processed = true;
+  }
+
+  if (ret == 0 && m_setDoviZeroLevel5)
+  {
+    ret = dovi_rpu_set_active_area_offsets(rpu, 0, 0, 0, 0);
+    processed = true;
+  }
+
+  if (ret == 0 && processed)
+    rpuData = dovi_write_unspec62_nalu(rpu);
+
+  dovi_rpu_free_header(header);
+  dovi_rpu_free(rpu);
+
+  return rpuData;
+}
+#endif

xbmc/utils/BitstreamConverter.h

@@ -17,6 +17,10 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavfilter/avfilter.h>
 #include <libavcodec/avcodec.h>
+
+#ifdef HAVE_LIBDOVI
+#include <libdovi/rpu_parser.h>
+#endif
 }
 
 typedef struct
@@ -102,6 +106,7 @@ class CBitstreamConverter
   void SetConvertDovi(bool value) { m_convert_dovi = value; }
   void SetRemoveDovi(bool value) { m_removeDovi = value; }
   void SetRemoveHdr10Plus(bool value) { m_removeHdr10Plus = value; }
+  void SetDoviZeroLevel5(bool value) { m_setDoviZeroLevel5 = value; }
 
   static bool       mpeg2_sequence_header(const uint8_t *data, const uint32_t size, mpeg2_sequence *sequence);
 
@@ -123,6 +128,10 @@ class CBitstreamConverter
                                     uint32_t in_size,
                                     uint8_t nal_type);
 
+#ifdef HAVE_LIBDOVI
+  const DoviData* processDoviRpu(uint8_t* buf, uint32_t nalSize);
+#endif
+
   typedef struct omx_bitstream_ctx {
       uint8_t  length_size;
       uint8_t  first_idr;
@@ -149,4 +158,5 @@ class CBitstreamConverter
   bool m_convert_dovi;
   bool m_removeDovi;
   bool m_removeHdr10Plus;
+  bool m_setDoviZeroLevel5;
 };