From 9efd83a5b16bce28bc3e1705ab24130cee832d71 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 31 Oct 2017 05:45:06 +0100 Subject: [PATCH] av1-encoder: Update properties for AV1 commit b9f5256d4016b9501e2d7024df196e67c30306f3 --- source/av1-encoder.cpp | 18 +++++++++--------- source/av1-encoder.h | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/av1-encoder.cpp b/source/av1-encoder.cpp index 2f24d16..8875dde 100644 --- a/source/av1-encoder.cpp +++ b/source/av1-encoder.cpp @@ -1,4 +1,4 @@ -/* +/* * AV1 Encoder for Open Broadcaster Software Studio * Copyright (C) 2017 Michael Fabian Dirks * @@ -181,11 +181,11 @@ void AV1Encoder::get_defaults(obs_data_t *data) { obs_data_set_default_int(data, P_LAGINFRAMES, cfg.g_lag_in_frames); obs_data_set_default_int(data, P_RC_DROPFRAMETHRESHOLD, cfg.rc_dropframe_thresh); obs_data_set_default_int(data, P_RC_RESIZE_MODE, cfg.rc_resize_mode); - obs_data_set_default_int(data, P_RC_RESIZE_NUMERATOR, cfg.rc_resize_numerator); - obs_data_set_default_int(data, P_RC_RESIZE_KEYFRAMENUMERATOR, cfg.rc_resize_kf_numerator); + obs_data_set_default_int(data, P_RC_RESIZE_NUMERATOR, cfg.rc_resize_denominator); + obs_data_set_default_int(data, P_RC_RESIZE_KEYFRAMENUMERATOR, cfg.rc_resize_kf_denominator); obs_data_set_default_int(data, P_RC_SUPERRES_MODE, cfg.rc_superres_mode); - obs_data_set_default_int(data, P_RC_SUPERRES_NUMERATOR, cfg.rc_superres_numerator); - obs_data_set_default_int(data, P_RC_SUPERRES_KEYFRAMENUMERATOR, cfg.rc_superres_kf_numerator); + obs_data_set_default_int(data, P_RC_SUPERRES_NUMERATOR, cfg.rc_superres_denominator); + obs_data_set_default_int(data, P_RC_SUPERRES_KEYFRAMENUMERATOR, cfg.rc_superres_kf_denominator); obs_data_set_default_int(data, P_RC_MODE, cfg.rc_end_usage); obs_data_set_default_int(data, P_RC_BITRATE, cfg.rc_target_bitrate); obs_data_set_default_int(data, P_RC_QUANTIZER_MIN, cfg.rc_min_quantizer); @@ -331,11 +331,11 @@ bool AV1Encoder::update(obs_data_t *data) { m_configuration.g_lag_in_frames = (unsigned int)obs_data_get_int(data, P_LAGINFRAMES); m_configuration.rc_dropframe_thresh = (unsigned int)obs_data_get_int(data, P_RC_DROPFRAMETHRESHOLD); m_configuration.rc_resize_mode = (unsigned int)obs_data_get_int(data, P_RC_RESIZE_MODE); - m_configuration.rc_resize_numerator = (unsigned int)obs_data_get_int(data, P_RC_RESIZE_NUMERATOR); - m_configuration.rc_resize_kf_numerator = (unsigned int)obs_data_get_int(data, P_RC_RESIZE_KEYFRAMENUMERATOR); + m_configuration.rc_resize_denominator = (unsigned int)obs_data_get_int(data, P_RC_RESIZE_NUMERATOR); + m_configuration.rc_resize_kf_denominator = (unsigned int)obs_data_get_int(data, P_RC_RESIZE_KEYFRAMENUMERATOR); m_configuration.rc_superres_mode = (unsigned int)obs_data_get_int(data, P_RC_SUPERRES_MODE); - m_configuration.rc_superres_numerator = (unsigned int)obs_data_get_int(data, P_RC_SUPERRES_NUMERATOR); - m_configuration.rc_superres_kf_numerator = (unsigned int)obs_data_get_int(data, P_RC_SUPERRES_KEYFRAMENUMERATOR); + m_configuration.rc_superres_denominator = (unsigned int)obs_data_get_int(data, P_RC_SUPERRES_NUMERATOR); + m_configuration.rc_superres_kf_denominator = (unsigned int)obs_data_get_int(data, P_RC_SUPERRES_KEYFRAMENUMERATOR); m_configuration.rc_end_usage = (aom_rc_mode)obs_data_get_int(data, P_RC_MODE); m_configuration.rc_target_bitrate = (unsigned int)obs_data_get_int(data, P_RC_BITRATE); m_configuration.rc_min_quantizer = (unsigned int)obs_data_get_int(data, P_RC_QUANTIZER_MIN); diff --git a/source/av1-encoder.h b/source/av1-encoder.h index f7ede75..aa85aa1 100644 --- a/source/av1-encoder.h +++ b/source/av1-encoder.h @@ -1,4 +1,4 @@ -/* +/* * AV1 Encoder for Open Broadcaster Software Studio * Copyright (C) 2017 Michael Fabian Dirks * @@ -18,11 +18,14 @@ */ #pragma once +extern "C" { +#pragma warning(push) +#pragma warning(disable:4201) #include "libobs/obs-module.h" - - //AOM #include #include +#pragma warning(pop) +} class AV1Encoder { public: