Export HDR Content Light Level metadata for madVR

Nevcairiel · Apr 23, 2017 · b9c5bc7 · b9c5bc7
1 parent 5068772
commit b9c5bc7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/common/includes/IMediaSideData.h b/common/includes/IMediaSideData.h
@@ -46,6 +46,21 @@ struct MediaSideDataHDR
 };
 #pragma pack(pop)
 
+// {ED6AE576-7CBE-41A6-9DC3-07C35DC13EF9}
+DEFINE_GUID(IID_MediaSideDataHDRContentLightLevel,
+  0xed6ae576, 0x7cbe, 0x41a6, 0x9d, 0xc3, 0x7, 0xc3, 0x5d, 0xc1, 0x3e, 0xf9);
+
+#pragma pack(push, 1)
+struct MediaSideDataHDRContentLightLevel
+{
+  // maximum content light level (cd/m2)
+  unsigned int MaxCLL;
+
+  // maximum frame average light level (cd/m2)
+  unsigned int MaxFALL;
+};
+#pragma pack(pop)
+
 // -----------------------------------------------------------------
 // 3D Plane Offset Side Data
 // -----------------------------------------------------------------

diff --git a/decoder/LAVVideo/decoders/avcodec.cpp b/decoder/LAVVideo/decoders/avcodec.cpp
@@ -1035,6 +1035,19 @@ STDMETHODIMP CDecAvcodec::DecodePacket(AVPacket *avpkt, REFERENCE_TIME rtStartIn
       }
     }
 
+    AVFrameSideData * sdHDRContentLightLevel = av_frame_get_side_data(m_pFrame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+    if (sdHDRContentLightLevel) {
+      if (sdHDRContentLightLevel->size == sizeof(AVContentLightMetadata)) {
+        AVContentLightMetadata *metadata = (AVContentLightMetadata *)sdHDR->data;
+        MediaSideDataHDRContentLightLevel * hdr = (MediaSideDataHDRContentLightLevel *)AddLAVFrameSideData(pOutFrame, IID_MediaSideDataHDRContentLightLevel, sizeof(MediaSideDataHDRContentLightLevel));
+        hdr->MaxCLL = metadata->MaxCLL;
+        hdr->MaxFALL = metadata->MaxFALL;
+      }
+      else {
+        DbgLog((LOG_TRACE, 10, L"::Decode(): Found HDR Light Level data of an unexpected size (%d)", sdHDRContentLightLevel->size));
+      }
+    }
+
     if (map.conversion) {
       ConvertPixFmt(m_pFrame, pOutFrame);
     } else {