From 774f7a33649c2ad97a3df2063218beb4951fd943 Mon Sep 17 00:00:00 2001 From: rigaya Date: Thu, 7 Nov 2024 21:06:49 +0900 Subject: [PATCH] =?UTF-8?q?AV1=E3=81=A7=E3=81=AF=E3=80=81HDR10+=20metadata?= =?UTF-8?q?=E3=81=AE=E5=89=8D=E3=81=AB=E3=80=81master-display=E3=81=A8max-?= =?UTF-8?q?cll=E3=81=AE=E6=83=85=E5=A0=B1=E3=82=92=E7=BD=AE=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=81=BB=E3=81=86=E3=81=8C=E8=89=AF=E3=81=84=E6=A8=A1?= =?UTF-8?q?=E6=A7=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NVEncCore/rgy_output.cpp | 2 +- NVEncCore/rgy_output_avcodec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NVEncCore/rgy_output.cpp b/NVEncCore/rgy_output.cpp index 4158292e..924e9d94 100644 --- a/NVEncCore/rgy_output.cpp +++ b/NVEncCore/rgy_output.cpp @@ -817,7 +817,7 @@ RGY_ERR RGYOutputRaw::WriteNextOneFrame(RGYBitstream *pBitstream) { std::vector> metadataList; if (m_hdrBitstream.size() > 0) { std::vector data(m_hdrBitstream.data(), m_hdrBitstream.data() + m_hdrBitstream.size()); - metadataList.push_back(std::make_unique(data, true, false)); + metadataList.push_back(std::make_unique(data, (m_VideoOutputInfo.codec == RGY_CODEC_AV1) ? false : true, false)); } if (m_hdr10plusMetadataCopy) { auto [err_hdr10plus, metadata_hdr10plus] = getMetadata(RGY_FRAME_DATA_HDR10PLUS, bs_framedata, nullptr); diff --git a/NVEncCore/rgy_output_avcodec.cpp b/NVEncCore/rgy_output_avcodec.cpp index b53abd47..94a5f84f 100644 --- a/NVEncCore/rgy_output_avcodec.cpp +++ b/NVEncCore/rgy_output_avcodec.cpp @@ -2804,7 +2804,7 @@ RGY_ERR RGYOutputAvcodec::WriteNextFrameInternalOneFrame(RGYBitstream *bitstream std::vector> metadataList; if (m_Mux.video.hdrBitstream.size() > 0) { std::vector data(m_Mux.video.hdrBitstream.data(), m_Mux.video.hdrBitstream.data() + m_Mux.video.hdrBitstream.size()); - metadataList.push_back(std::make_unique(data, true, false)); + metadataList.push_back(std::make_unique(data, (m_VideoOutputInfo.codec == RGY_CODEC_AV1) ? false : true, false)); } if (m_Mux.video.hdr10plusMetadataCopy) { auto [err_hdr10plus, metadata_hdr10plus] = getMetadata(RGY_FRAME_DATA_HDR10PLUS, bs_framedata, nullptr);