HDR関連のmetadataをstreamのsidedataとして設定するように。( #46 )

rigaya · May 2, 2018 · d3a3ba9 · d3a3ba9
1 parent f844541
commit d3a3ba9
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 5 deletions.
diff --git a/NVEncCore/NVEncCore.cpp b/NVEncCore/NVEncCore.cpp
@@ -751,7 +751,7 @@ NVENCSTATUS NVEncCore::InitOutput(InEncodeVideoParam *inputParams, NV_ENC_BUFFER
         writerPrm.pQueueInfo = (m_pPerfMonitor) ? m_pPerfMonitor->GetQueueInfoPtr() : nullptr;
         writerPrm.pMuxVidTsLogFile        = inputParams->pMuxVidTsLogFile;
         writerPrm.rBitstreamTimebase      = av_make_q(m_outputTimebase);
-        writerPrm.seiNal                  = hedrsei.gen_nal();
+        writerPrm.pHEVCHdrSei             = &hedrsei;
         if (inputParams->pMuxOpt > 0) {
             writerPrm.vMuxOpt = *inputParams->pMuxOpt;
         }

diff --git a/NVEncCore/rgy_avutil.h b/NVEncCore/rgy_avutil.h
@@ -43,6 +43,7 @@ extern "C" {
 #include <libavutil/frame.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
+#include <libavutil/mastering_display_metadata.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libswresample/swresample.h>

diff --git a/NVEncCore/rgy_output_avcodec.cpp b/NVEncCore/rgy_output_avcodec.cpp
@@ -515,8 +515,61 @@ RGY_ERR RGYOutputAvcodec::InitVideo(const VideoInfo *pVideoOutputInfo, const Avc
 
     m_Mux.video.timestampList.clear();
 
-    if (pVideoOutputInfo->codec == RGY_CODEC_HEVC && prm->seiNal.size() > 0) {
-        m_Mux.video.seiNal.copy(prm->seiNal.data(), prm->seiNal.size());
+    if (pVideoOutputInfo->codec == RGY_CODEC_HEVC && prm->pHEVCHdrSei != nullptr) {
+        auto seiNal = prm->pHEVCHdrSei->gen_nal();
+        if (seiNal.size() > 0) {
+            m_Mux.video.seiNal.copy(seiNal.data(), seiNal.size());
+
+            const auto HEVCHdrSeiPrm = prm->pHEVCHdrSei->getprm();
+
+            //streamのside dataとしてmasteringdisplay等を設定する
+            //mkv等では、これをしておかないとヘッダ部分に情報が適切にセットされない場合がある
+            size_t coll_size = 0;
+            unique_ptr<AVContentLightMetadata, decltype(&av_freep)> coll(av_content_light_metadata_alloc(&coll_size), av_freep);
+            unique_ptr<AVMasteringDisplayMetadata, decltype(&av_freep)> mastering(av_mastering_display_metadata_alloc(), av_freep);
+
+            coll->MaxCLL = HEVCHdrSeiPrm.maxcll;
+            coll->MaxFALL = HEVCHdrSeiPrm.maxfall;
+
+            mastering->display_primaries[0][0] = av_make_q(HEVCHdrSeiPrm.masterdisplay[0], 50000);
+            mastering->display_primaries[0][1] = av_make_q(HEVCHdrSeiPrm.masterdisplay[1], 50000);
+            mastering->display_primaries[1][0] = av_make_q(HEVCHdrSeiPrm.masterdisplay[2], 50000);
+            mastering->display_primaries[1][1] = av_make_q(HEVCHdrSeiPrm.masterdisplay[3], 50000);
+            mastering->display_primaries[2][0] = av_make_q(HEVCHdrSeiPrm.masterdisplay[4], 50000);
+            mastering->display_primaries[2][1] = av_make_q(HEVCHdrSeiPrm.masterdisplay[5], 50000);
+            mastering->white_point[0] = av_make_q(HEVCHdrSeiPrm.masterdisplay[6], 50000);
+            mastering->white_point[1] = av_make_q(HEVCHdrSeiPrm.masterdisplay[7], 50000);
+            mastering->min_luminance = av_make_q(HEVCHdrSeiPrm.masterdisplay[8], 10000);
+            mastering->max_luminance = av_make_q(HEVCHdrSeiPrm.masterdisplay[9], 10000);
+            mastering->has_primaries = 1;
+            mastering->has_luminance = 1;
+
+            AddMessage(RGY_LOG_DEBUG, _T("MaxCLL=%d, MaxFALL=%d\n"),
+                coll->MaxCLL, coll->MaxFALL);
+            AddMessage(RGY_LOG_DEBUG, _T("Mastering Display: R(%f,%f) G(%f,%f) B(%f %f) WP(%f, %f) L(%f,%f)\n"),
+                av_q2d(mastering->display_primaries[0][0]),
+                av_q2d(mastering->display_primaries[0][1]),
+                av_q2d(mastering->display_primaries[1][0]),
+                av_q2d(mastering->display_primaries[1][1]),
+                av_q2d(mastering->display_primaries[2][0]),
+                av_q2d(mastering->display_primaries[2][1]),
+                av_q2d(mastering->white_point[0]), av_q2d(mastering->white_point[1]),
+                av_q2d(mastering->min_luminance), av_q2d(mastering->max_luminance));
+
+            int err = av_stream_add_side_data(m_Mux.video.pStreamOut, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, (uint8_t *)mastering.get(), sizeof(mastering.get()[0]));
+            if (err < 0) {
+                AddMessage(RGY_LOG_ERROR, _T("failed to set AV_PKT_DATA_MASTERING_DISPLAY_METADATA\n"));
+                return RGY_ERR_INVALID_CALL;
+            }
+            AddMessage(RGY_LOG_DEBUG, _T("set AV_PKT_DATA_MASTERING_DISPLAY_METADATA\n"));
+
+            err = av_stream_add_side_data(m_Mux.video.pStreamOut, AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)coll.get(), coll_size);
+            if (err < 0) {
+                AddMessage(RGY_LOG_ERROR, _T("failed to set AV_PKT_DATA_CONTENT_LIGHT_LEVEL\n"));
+                return RGY_ERR_INVALID_CALL;
+            }
+            AddMessage(RGY_LOG_DEBUG, _T("set AV_PKT_DATA_CONTENT_LIGHT_LEVEL\n"));
+        }
     }
 
     if (prm->pMuxVidTsLogFile) {

diff --git a/NVEncCore/rgy_output_avcodec.h b/NVEncCore/rgy_output_avcodec.h
@@ -37,6 +37,7 @@
 #include <atomic>
 #include <cstdint>
 #include "rgy_avutil.h"
+#include "rgy_bitstream.h"
 #include "rgy_input_avcodec.h"
 #include "rgy_output.h"
 #include "rgy_perf_monitor.h"
@@ -274,7 +275,7 @@ struct AvcodecWriterPrm {
     muxOptList                   vMuxOpt;                 //mux時に使用するオプション
     PerfQueueInfo               *pQueueInfo;              //キューの情報を格納する構造体
     const TCHAR                 *pMuxVidTsLogFile;        //mux timestampログファイル
-    vector<uint8_t>              seiNal;                  //追加のsei nal
+    HEVCHDRSei                  *pHEVCHdrSei;             //HDR関連のmetadata
 
     AvcodecWriterPrm() :
         pInputFormatMetadata(nullptr),
@@ -295,7 +296,7 @@ struct AvcodecWriterPrm {
         vMuxOpt(),
         pQueueInfo(nullptr),
         pMuxVidTsLogFile(nullptr),
-        seiNal() {
+        pHEVCHdrSei(nullptr) {
     }
 };