mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

obs-ffmpeg: Set MaxCLL/MaxFALL for AMF

Browse Source
This commit is contained in:
jpark37 2022-07-29 22:37:13 -07:00 committed by Jim
parent 00828d1d06
commit 5ae7a92101
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/obs-ffmpeg/texture-amf.cpp
View File

@ -1436,18 +1436,12 @@ constexpr amf_uint16 amf_hdr_primary(uint32_t num, uint32_t den)
} }
constexpr amf_uint32 lum_mul = 10000; constexpr amf_uint32 lum_mul = 10000;
constexpr float lum_mul_f = (float)lum_mul;
constexpr amf_uint32 amf_make_lum(amf_uint32 val) constexpr amf_uint32 amf_make_lum(amf_uint32 val)
{ {
return val * lum_mul; return val * lum_mul;
} }
static inline amf_uint32 amf_nominal_level()
{
return (amf_uint32)(obs_get_video_hdr_nominal_peak_level() * lum_mul_f);
}
static void amf_hevc_create_internal(amf_base *enc, obs_data_t *settings) static void amf_hevc_create_internal(amf_base *enc, obs_data_t *settings)
{ {
AMF_RESULT res; AMF_RESULT res;
@ -1487,6 +1481,10 @@ static void amf_hevc_create_internal(amf_base *enc, obs_data_t *settings)
set_hevc_property(enc, NOMINAL_RANGE, enc->full_range); set_hevc_property(enc, NOMINAL_RANGE, enc->full_range);
if (is_hdr) { if (is_hdr) {
const int hdr_nominal_peak_level =
pq ? (int)obs_get_video_hdr_nominal_peak_level()
: (hlg ? 1000 : 0);
AMFBufferPtr buf; AMFBufferPtr buf;
enc->amf_context->AllocBuffer(AMF_MEMORY_HOST, enc->amf_context->AllocBuffer(AMF_MEMORY_HOST,
sizeof(AMFHDRMetadata), &buf); sizeof(AMFHDRMetadata), &buf);
@ -1500,10 +1498,10 @@ static void amf_hevc_create_internal(amf_base *enc, obs_data_t *settings)
md->whitePoint[0] = amf_hdr_primary(3127, 10000); md->whitePoint[0] = amf_hdr_primary(3127, 10000);
md->whitePoint[1] = amf_hdr_primary(329, 1000); md->whitePoint[1] = amf_hdr_primary(329, 1000);
md->minMasteringLuminance = 0; md->minMasteringLuminance = 0;
md->maxMasteringLuminance = pq ? amf_nominal_level() md->maxMasteringLuminance =
: (hlg ? amf_make_lum(1000) : 0); amf_make_lum(hdr_nominal_peak_level);
md->maxContentLightLevel = 0; md->maxContentLightLevel = hdr_nominal_peak_level;
md->maxFrameAverageLightLevel = 0; md->maxFrameAverageLightLevel = hdr_nominal_peak_level;
set_hevc_property(enc, INPUT_HDR_METADATA, buf); set_hevc_property(enc, INPUT_HDR_METADATA, buf);
} }