AMLCodec: checkin hdr10p data if available

Author: Portisch

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

@@ -126,6 +126,7 @@ class DllLibamCodecInterface
   virtual int codec_resume(codec_para_t *pcodec)=0;
   virtual int codec_write(codec_para_t *pcodec, void *buffer, int len)=0;
   virtual int codec_checkin_pts_us64(codec_para_t *pcodec, unsigned long long pts)=0;
+  virtual int codec_checkin_hdr10p_data(codec_para_t *pcodec)=0;
   virtual int codec_get_vbuf_state(codec_para_t *pcodec, struct buf_status *buf)=0;
   virtual int codec_get_vdec_state(codec_para_t *pcodec, struct vdec_status *vdec)=0;
   virtual int codec_get_vdec_info(codec_para_t *pcodec, struct vdec_info *vdec) = 0;
@@ -154,6 +155,7 @@ class DllLibAmCodec : public DllDynamic, DllLibamCodecInterface
   DEFINE_METHOD1(int, codec_resume,             (codec_para_t *p1))
   DEFINE_METHOD3(int, codec_write,              (codec_para_t *p1, void *p2, int p3))
   DEFINE_METHOD2(int, codec_checkin_pts_us64,   (codec_para_t *p1, unsigned long long p2))
+  DEFINE_METHOD1(int, codec_checkin_hdr10p_data,(codec_para_t *p1))
   DEFINE_METHOD2(int, codec_get_vbuf_state,     (codec_para_t *p1, struct buf_status * p2))
   DEFINE_METHOD2(int, codec_get_vdec_state,     (codec_para_t *p1, struct vdec_status * p2))
   DEFINE_METHOD2(int, codec_get_vdec_info,      (codec_para_t *p1, struct vdec_info * p2))
@@ -177,6 +179,7 @@ class DllLibAmCodec : public DllDynamic, DllLibamCodecInterface
     RESOLVE_METHOD(codec_resume)
     RESOLVE_METHOD(codec_write)
     RESOLVE_METHOD(codec_checkin_pts_us64)
+    RESOLVE_METHOD(codec_checkin_hdr10p_data)
     RESOLVE_METHOD(codec_get_vbuf_state)
     RESOLVE_METHOD(codec_get_vdec_state)
     RESOLVE_METHOD(codec_get_vdec_info)
@@ -2592,6 +2595,13 @@ bool CAMLCodec::AddData(uint8_t *pData, size_t iSize, double dts, double pts)
   return true;
 }
 
+int CAMLCodec::AddHDR10PData(uint8_t *pData, size_t iSize)
+{
+  am_private->vcodec.hdr10p_data.pointer = pData;
+  am_private->vcodec.hdr10p_data.len = iSize;
+  return m_dll->codec_checkin_hdr10p_data(&am_private->vcodec);
+}
+
 int CAMLCodec::m_pollDevice;
 
 int CAMLCodec::PollFrame()

xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h

@@ -69,6 +69,7 @@ class CAMLCodec
   void          Reset();
 
   bool          AddData(uint8_t *pData, size_t size, double dts, double pts);
+  int           AddHDR10PData(uint8_t *pData, size_t iSize);
   CDVDVideoCodec::VCReturn GetPicture(VideoPicture* pVideoPicture);
 
   void          SetSpeed(int speed);

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

@@ -521,6 +521,20 @@ bool CDVDVideoCodecAmlogic::AddData(const DemuxPacket &packet)
     }
   }
 
+  if (packet.pSideData && packet.iSideDataElems > 0)
+  {
+    const AVPacketSideData* sideData = av_packet_side_data_get(static_cast<AVPacketSideData*>(packet.pSideData),
+                                                               packet.iSideDataElems,
+                                                               AV_PKT_DATA_DYNAMIC_HDR10_PLUS_RAW);
+
+    if (sideData && sideData->size)
+    {
+      if (m_Codec->AddHDR10PData(sideData->data, sideData->size) < 0)
+        CLog::Log(LOGWARNING, "CDVDVideoCodecAmlogic::{}: failed to set hdr10p data with size {}", __FUNCTION__,
+          sideData->size);
+    }
+  }
+
   data_added = m_Codec->AddData(pData, iSize, packet.dts, m_hints.ptsinvalid ? DVD_NOPTS_VALUE : packet.pts);
 
   // pop package only from list if hardware decoder did accept the data