Skip to content

Moved check_conf function from xeve_app implementation to xeve API #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpeg5 merged 3 commits into from
Jun 21, 2022
Merged

Moved check_conf function from xeve_app implementation to xeve API #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60d3ec7
Moved check_conf function from xeve_app implementation to xeve API
dkozinski Jun 17, 2022
15421fd
Merge branch 'master' into dev-CheckCfgFunction2XeveAPI
dkozinski Jun 20, 2022
41ddc54
Changes following code review
dkozinski Jun 20, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ if(("${SET_PROF}" STREQUAL "MAIN"))
add_executable (${EXE_NAME} ${ENC_SRC} ${ENC_INC} )
include_directories( ${EXE_NAME} PUBLIC . .. ../inc ../src_base ../src_main ${BASE_SRC_PATH})

# Comment the following line for dynamic linking
target_link_libraries (${EXE_NAME} xeve)

# Uncommet the following line for dynamic linking
# target_link_libraries (${EXE_NAME} xeve_dynamic)
if(XEVE_APP_STATIC_BUILD)
target_link_libraries (${EXE_NAME} xeve)
else()
target_link_libraries (${EXE_NAME} xeve_dynamic)
endif()

set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "app")
set_target_properties(${EXE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
Expand All @@ -38,11 +38,11 @@ if(("${SET_PROF}" STREQUAL "BASE"))
add_executable (${EXE_NAME_BASE} ${ENC_SRC} ${ENC_INC} )
include_directories( ${EXE_NAME_BASE} PUBLIC . .. ../inc ../src_base ../src_main ${BASE_SRC_PATH})

# Comment the following line for dynamic linking
target_link_libraries (${EXE_NAME_BASE} xeveb)

# Uncommet the following line for dynamic linking
# target_link_libraries (${EXE_NAME_BASE} xeveb_dynamic)
if(XEVE_APP_STATIC_BUILD)
target_link_libraries (${EXE_NAME_BASE} xeveb)
else()
target_link_libraries (${EXE_NAME_BASE} xeveb_dynamic)
endif()

set_property(TARGET ${EXE_NAME_BASE} PROPERTY FOLDER "app")
set_target_properties(${EXE_NAME_BASE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
Expand Down
80 changes: 1 addition & 79 deletions app/xeve_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,84 +122,6 @@ static void print_usage(const char **argv)
if(args) args->release(args);
}

int check_conf(XEVE_CDSC* cdsc)
{
XEVE_PARAM * param;
int ret = 0;
int min_block_size = 4;
param = &cdsc->param;

if(param->profile == 0)
{
if (param->tool_amvr == 1) { logerr("AMVR cannot be on in base profile\n"); ret = -1; }
if (param->tool_mmvd == 1) { logerr("MMVD cannot be on in base profile\n"); ret = -1; }
if (param->tool_affine == 1) { logerr("Affine cannot be on in base profile\n"); ret = -1; }
if (param->tool_dmvr == 1) { logerr("DMVR cannot be on in base profile\n"); ret = -1; }
if (param->tool_admvp == 1) { logerr("ADMVP cannot be on in base profile\n"); ret = -1; }
if (param->tool_hmvp == 1) { logerr("HMVP cannot be on in base profile\n"); ret = -1; }
if (param->tool_addb == 1) { logerr("ADDB cannot be on in base profile\n"); ret = -1; }
if (param->tool_alf == 1) { logerr("ALF cannot be on in base profile\n"); ret = -1; }
if (param->tool_htdf == 1) { logerr("HTDF cannot be on in base profile\n"); ret = -1; }
if (param->btt == 1) { logerr("BTT cannot be on in base profile\n"); ret = -1; }
if (param->suco == 1) { logerr("SUCO cannot be on in base profile\n"); ret = -1; }
if (param->tool_eipd == 1) { logerr("EIPD cannot be on in base profile\n"); ret = -1; }
if (param->tool_iqt == 1) { logerr("IQT cannot be on in base profile\n"); ret = -1; }
if (param->tool_cm_init == 1) { logerr("CM_INIT cannot be on in base profile\n"); ret = -1; }
if (param->tool_adcc == 1) { logerr("ADCC cannot be on in base profile\n"); ret = -1; }
if (param->tool_ats == 1) { logerr("ATS_INTRA cannot be on in base profile\n"); ret = -1; }
if (param->ibc_flag == 1) { logerr("IBC cannot be on in base profile\n"); ret = -1; }
if (param->tool_rpl == 1) { logerr("RPL cannot be on in base profile\n"); ret = -1; }
if (param->tool_pocs == 1) { logerr("POCS cannot be on in base profile\n"); ret = -1; }
}
else
{
if (param->tool_admvp == 0 && param->tool_affine == 1) { logerr("AFFINE cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_amvr == 1) { logerr("AMVR cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_dmvr == 1) { logerr("DMVR cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_mmvd == 1) { logerr("MMVD cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_eipd == 0 && param->ibc_flag == 1) { logerr("IBC cannot be on when EIPD is off\n"); ret = -1; }
if (param->tool_iqt == 0 && param->tool_ats == 1) { logerr("ATS cannot be on when IQT is off\n"); ret = -1; }
if (param->tool_cm_init == 0 && param->tool_adcc == 1) { logerr("ADCC cannot be on when CM_INIT is off\n"); ret = -1; }
}

if (param->btt == 1)
{
if (param->framework_cb_max && param->framework_cb_max < 5) { logerr("Maximun Coding Block size cannot be smaller than 5\n"); ret = -1; }
if (param->framework_cb_max > 7) { logerr("Maximun Coding Block size cannot be greater than 7\n"); ret = -1; }
if (param->framework_cb_min && param->framework_cb_min < 2) { logerr("Minimum Coding Block size cannot be smaller than 2\n"); ret = -1; }
if ((param->framework_cb_max || param->framework_cb_min) &&
param->framework_cb_min > param->framework_cb_max) { logerr("Minimum Coding Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_cu14_max > 6) { logerr("Maximun 1:4 Coding Block size cannot be greater than 6\n"); ret = -1; }
if ((param->framework_cb_max || param->framework_cu14_max) &&
param->framework_cu14_max > param->framework_cb_max) { logerr("Maximun 1:4 Coding Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_tris_max > 6) { logerr("Maximun Tri-split Block size be greater than 6\n"); ret = -1; }
if ((param->framework_tris_max || param->framework_cb_max) &&
param->framework_tris_max > param->framework_cb_max) { logerr("Maximun Tri-split Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if ((param->framework_tris_min || param->framework_cb_min) &&
param->framework_tris_min < param->framework_cb_min + 2) { logerr("Maximun Tri-split Block size cannot be smaller than Minimum Coding Block size plus two\n"); ret = -1; }
if(param->framework_cb_min) min_block_size = 1 << param->framework_cb_min;
else min_block_size = 8;
}

if (param->suco == 1)
{
if (param->framework_suco_max > 6) { logerr("Maximun SUCO size cannot be greater than 6\n"); ret = -1; }
if (param->framework_cb_max && param->framework_suco_max > param->framework_cb_max) { logerr("Maximun SUCO size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_suco_min < 4) { logerr("Minimun SUCO size cannot be smaller than 4\n"); ret = -1; }
if (param->framework_cb_min && param->framework_suco_min < param->framework_cb_min) { logerr("Minimun SUCO size cannot be smaller than Minimum coding Block size\n"); ret = -1; }
if (param->framework_suco_min > param->framework_suco_max) { logerr("Minimum SUCO size cannot be greater than Maximum SUCO size\n"); ret = -1; }
}

if (XEVE_CS_GET_FORMAT(param->cs) != XEVE_CF_YCBCR400)
{
int pic_m = 2;
if ((param->w & (pic_m - 1)) != 0) { logerr("Current encoder does not support odd picture width\n"); ret = -1; }
if ((param->h & (pic_m - 1)) != 0) { logerr("Current encoder does not support odd picture height\n"); ret = -1; }
}

return ret;
}

static int set_extra_config(XEVE id, ARGS_PARSER * args, XEVE_PARAM * param)
{
int ret, size, value;
Expand Down Expand Up @@ -1150,7 +1072,7 @@ int main(int argc, const char **argv)

cdsc.max_bs_buf_size = MAX_BS_BUF; /* maximum bitstream buffer size */

if (check_conf(&cdsc))
if (xeve_param_check(param))
{
logerr("invalid configuration\n");
ret = -1; goto ERR;
Expand Down
1 change: 1 addition & 0 deletions inc/xeve.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ int XEVE_EXPORT xeve_encode(XEVE id, XEVE_BITB * bitb, XEVE_STAT * stat);
int XEVE_EXPORT xeve_config(XEVE id, int cfg, void * buf, int * size);
int XEVE_EXPORT xeve_param_default(XEVE_PARAM* param);
int XEVE_EXPORT xeve_param_ppt(XEVE_PARAM* param, int profile, int preset, int tune);
int XEVE_EXPORT xeve_param_check(const XEVE_PARAM* param);

#ifdef __cplusplus
} /* extern "C" */
Expand Down
76 changes: 76 additions & 0 deletions src_base/xeve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,79 @@ int xeve_param_ppt(XEVE_PARAM* param, int profile, int preset, int tune)
}
return xeve_param_apply_ppt_baseline(param, profile, preset, tune);
}

int xeve_param_check(const XEVE_PARAM* param)
{
int ret = 0;
int min_block_size = 4;

if(param->profile == 0)
{
if (param->tool_amvr == 1) { xeve_trace("AMVR cannot be on in base profile\n"); ret = -1; }
if (param->tool_mmvd == 1) { xeve_trace("MMVD cannot be on in base profile\n"); ret = -1; }
if (param->tool_affine == 1) { xeve_trace("Affine cannot be on in base profile\n"); ret = -1; }
if (param->tool_dmvr == 1) { xeve_trace("DMVR cannot be on in base profile\n"); ret = -1; }
if (param->tool_admvp == 1) { xeve_trace("ADMVP cannot be on in base profile\n"); ret = -1; }
if (param->tool_hmvp == 1) { xeve_trace("HMVP cannot be on in base profile\n"); ret = -1; }
if (param->tool_addb == 1) { xeve_trace("ADDB cannot be on in base profile\n"); ret = -1; }
if (param->tool_alf == 1) { xeve_trace("ALF cannot be on in base profile\n"); ret = -1; }
if (param->tool_htdf == 1) { xeve_trace("HTDF cannot be on in base profile\n"); ret = -1; }
if (param->btt == 1) { xeve_trace("BTT cannot be on in base profile\n"); ret = -1; }
if (param->suco == 1) { xeve_trace("SUCO cannot be on in base profile\n"); ret = -1; }
if (param->tool_eipd == 1) { xeve_trace("EIPD cannot be on in base profile\n"); ret = -1; }
if (param->tool_iqt == 1) { xeve_trace("IQT cannot be on in base profile\n"); ret = -1; }
if (param->tool_cm_init == 1) { xeve_trace("CM_INIT cannot be on in base profile\n"); ret = -1; }
if (param->tool_adcc == 1) { xeve_trace("ADCC cannot be on in base profile\n"); ret = -1; }
if (param->tool_ats == 1) { xeve_trace("ATS_INTRA cannot be on in base profile\n"); ret = -1; }
if (param->ibc_flag == 1) { xeve_trace("IBC cannot be on in base profile\n"); ret = -1; }
if (param->tool_rpl == 1) { xeve_trace("RPL cannot be on in base profile\n"); ret = -1; }
if (param->tool_pocs == 1) { xeve_trace("POCS cannot be on in base profile\n"); ret = -1; }
}
else
{
if (param->tool_admvp == 0 && param->tool_affine == 1) { xeve_trace("AFFINE cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_amvr == 1) { xeve_trace("AMVR cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_dmvr == 1) { xeve_trace("DMVR cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_admvp == 0 && param->tool_mmvd == 1) { xeve_trace("MMVD cannot be on when ADMVP is off\n"); ret = -1; }
if (param->tool_eipd == 0 && param->ibc_flag == 1) { xeve_trace("IBC cannot be on when EIPD is off\n"); ret = -1; }
if (param->tool_iqt == 0 && param->tool_ats == 1) { xeve_trace("ATS cannot be on when IQT is off\n"); ret = -1; }
if (param->tool_cm_init == 0 && param->tool_adcc == 1) { xeve_trace("ADCC cannot be on when CM_INIT is off\n"); ret = -1; }
}

if (param->btt == 1)
{
if (param->framework_cb_max && param->framework_cb_max < 5) { xeve_trace("Maximun Coding Block size cannot be smaller than 5\n"); ret = -1; }
if (param->framework_cb_max > 7) { xeve_trace("Maximun Coding Block size cannot be greater than 7\n"); ret = -1; }
if (param->framework_cb_min && param->framework_cb_min < 2) { xeve_trace("Minimum Coding Block size cannot be smaller than 2\n"); ret = -1; }
if ((param->framework_cb_max || param->framework_cb_min) &&
param->framework_cb_min > param->framework_cb_max) { xeve_trace("Minimum Coding Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_cu14_max > 6) { xeve_trace("Maximun 1:4 Coding Block size cannot be greater than 6\n"); ret = -1; }
if ((param->framework_cb_max || param->framework_cu14_max) &&
param->framework_cu14_max > param->framework_cb_max) { xeve_trace("Maximun 1:4 Coding Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_tris_max > 6) { xeve_trace("Maximun Tri-split Block size be greater than 6\n"); ret = -1; }
if ((param->framework_tris_max || param->framework_cb_max) &&
param->framework_tris_max > param->framework_cb_max) { xeve_trace("Maximun Tri-split Block size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if ((param->framework_tris_min || param->framework_cb_min) &&
param->framework_tris_min < param->framework_cb_min + 2) { xeve_trace("Maximun Tri-split Block size cannot be smaller than Minimum Coding Block size plus two\n"); ret = -1; }
if(param->framework_cb_min) min_block_size = 1 << param->framework_cb_min;
else min_block_size = 8;
}

if (param->suco == 1)
{
if (param->framework_suco_max > 6) { xeve_trace("Maximun SUCO size cannot be greater than 6\n"); ret = -1; }
if (param->framework_cb_max && param->framework_suco_max > param->framework_cb_max) { xeve_trace("Maximun SUCO size cannot be greater than Maximum coding Block size\n"); ret = -1; }
if (param->framework_suco_min < 4) { xeve_trace("Minimun SUCO size cannot be smaller than 4\n"); ret = -1; }
if (param->framework_cb_min && param->framework_suco_min < param->framework_cb_min) { xeve_trace("Minimun SUCO size cannot be smaller than Minimum coding Block size\n"); ret = -1; }
if (param->framework_suco_min > param->framework_suco_max) { xeve_trace("Minimum SUCO size cannot be greater than Maximum SUCO size\n"); ret = -1; }
}

if (XEVE_CS_GET_FORMAT(param->cs) != XEVE_CF_YCBCR400)
{
int pic_m = 2;
if ((param->w & (pic_m - 1)) != 0) { xeve_trace("Current encoder does not support odd picture width\n"); ret = -1; }
if ((param->h & (pic_m - 1)) != 0) { xeve_trace("Current encoder does not support odd picture height\n"); ret = -1; }
}

return ret;
}
Loading