diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt index 77b14c3b..14c5471a 100644 --- a/tests/conformance/CMakeLists.txt +++ b/tests/conformance/CMakeLists.txt @@ -16,288 +16,288 @@ set( CP1_nbC_list "not_used;1;3;4;1;3;3;2") set(COMMENTCODEVAR FALSE) -#-------------------------------------------------------------------------- -# Tests about class 0 profile 0 -# try to decode -# compare to ref file provided by the Executable Test Suite -# non regression comparison +##-------------------------------------------------------------------------- +## Tests about class 0 profile 0 +## try to decode +## compare to ref file provided by the Executable Test Suite +## non regression comparison -# Parameters and tolerances given by Table C.1 -set( C0P0_ResFactor_list "not_used;0;0;0;3;3;3;0;5;2;0;0;0;0;2;0;0") -set( C0P0_PEAK_list "not_used;0;0;0;33;54;109;10;7;4;10;0;0;0;0;0;0") -set( C0P0_MSE_list "not_used;0;0;0;55.8;68;743;0.34;6.72;1.47;2.84;0;0;0;0;0;0") +## Parameters and tolerances given by Table C.1 +#set( C0P0_ResFactor_list "not_used;0;0;0;3;3;3;0;5;2;0;0;0;0;2;0;0") +#set( C0P0_PEAK_list "not_used;0;0;0;33;54;109;10;7;4;10;0;0;0;0;0;0") +#set( C0P0_MSE_list "not_used;0;0;0;55.8;68;743;0.34;6.72;1.47;2.84;0;0;0;0;0;0") -foreach(numFileC0P0 RANGE 1 16) +#foreach(numFileC0P0 RANGE 1 16) - # Build filenames - if(${numFileC0P0} LESS 10) - set( filenameInput p0_0${numFileC0P0}.j2k ) - set( filenameRef c0p0_0${numFileC0P0}.pgx ) - else() - set( filenameInput p0_${numFileC0P0}.j2k ) - set( filenameRef c0p0_${numFileC0P0}.pgx ) - endif() +# # Build filenames +# if(${numFileC0P0} LESS 10) +# set( filenameInput p0_0${numFileC0P0}.j2k ) +# set( filenameRef c0p0_0${numFileC0P0}.pgx ) +# else() +# set( filenameInput p0_${numFileC0P0}.j2k ) +# set( filenameRef c0p0_${numFileC0P0}.pgx ) +# endif() - # Get corresponding tests parameters - list(GET C0P0_ResFactor_list ${numFileC0P0} ResFactor) - #For Class-0 testing, we always focus on the first component only - #list(GET CP0_nbC_list ${numFileC0P0} nbComponents) - set( nbComponents "1") - list(GET C0P0_PEAK_list ${numFileC0P0} PEAK_limit) - list(GET C0P0_MSE_list ${numFileC0P0} MSE_limit) +# # Get corresponding tests parameters +# list(GET C0P0_ResFactor_list ${numFileC0P0} ResFactor) +# #For Class-0 testing, we always focus on the first component only +# #list(GET CP0_nbC_list ${numFileC0P0} nbComponents) +# set( nbComponents "1") +# list(GET C0P0_PEAK_list ${numFileC0P0} PEAK_limit) +# list(GET C0P0_MSE_list ${numFileC0P0} MSE_limit) - # Manage cases which need to try different resolution reduction - if (numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) - get_filename_component(filenameRefSub ${filenameRef} NAME_WE) - #r = 0 +# # Manage cases which need to try different resolution reduction +# if (numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) +# get_filename_component(filenameRefSub ${filenameRef} NAME_WE) +# #r = 0 - add_test(ETS-C0P0-${filenameInput}-r0-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}-r0.pgx - -r 0 - ) +# add_test(ETS-C0P0-${filenameInput}-r0-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}-r0.pgx +# -r 0 +# ) - add_test(ETS-C0P0-${filenameInput}-r0-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx - -t ${TEMP}/c0${filenameInput}-r0.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P0-${filenameInput}-r0-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx +# -t ${TEMP}/c0${filenameInput}-r0.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P0-${filenameInput}-r0-compare2ref - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-r0-decode) +# set_tests_properties(ETS-C0P0-${filenameInput}-r0-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-r0-decode) - add_test(NR-C0P0-${filenameInput}-r0-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx - -t ${TEMP}/c0${filenameInput}-r0.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P0-${filenameInput}-r0-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx +# -t ${TEMP}/c0${filenameInput}-r0.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P0-${filenameInput}-r0-compare2base - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-r0-decode) +# set_tests_properties(NR-C0P0-${filenameInput}-r0-compare2base +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-r0-decode) - #r = 1 - add_test(ETS-C0P0-${filenameInput}-r1-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}-r1.pgx - -r 1 - ) +# #r = 1 +# add_test(ETS-C0P0-${filenameInput}-r1-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}-r1.pgx +# -r 1 +# ) - add_test(ETS-C0P0-${filenameInput}-r1-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRefSub}r1.pgx - -t ${TEMP}/c0${filenameInput}-r1.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P0-${filenameInput}-r1-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRefSub}r1.pgx +# -t ${TEMP}/c0${filenameInput}-r1.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P0-${filenameInput}-r1-compare2ref - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-r1-decode) +# set_tests_properties(ETS-C0P0-${filenameInput}-r1-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-r1-decode) - add_test(NR-C0P0-${filenameInput}-r1-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRefSub}-r1.pgx - -t ${TEMP}/c0${filenameInput}-r1.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P0-${filenameInput}-r1-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRefSub}-r1.pgx +# -t ${TEMP}/c0${filenameInput}-r1.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P0-${filenameInput}-r1-compare2base - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-r1-decode) +# set_tests_properties(NR-C0P0-${filenameInput}-r1-compare2base +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-r1-decode) - else() +# else() - add_test(ETS-C0P0-${filenameInput}-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}.pgx - -r ${ResFactor} - ) +# add_test(ETS-C0P0-${filenameInput}-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}.pgx +# -r ${ResFactor} +# ) - add_test(ETS-C0P0-${filenameInput}-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRef} - -t ${TEMP}/c0${filenameInput}.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P0-${filenameInput}-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRef} +# -t ${TEMP}/c0${filenameInput}.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P0-${filenameInput}-compare2ref - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-decode) +# set_tests_properties(ETS-C0P0-${filenameInput}-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-decode) - add_test(NR-C0P0-${filenameInput}-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRef} - -t ${TEMP}/c0${filenameInput}.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P0-${filenameInput}-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRef} +# -t ${TEMP}/c0${filenameInput}.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P0-${filenameInput}-compare2base - PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-decode) +# set_tests_properties(NR-C0P0-${filenameInput}-compare2base +# PROPERTIES DEPENDS +# ETS-C0P0-${filenameInput}-decode) - endif() +# endif() -endforeach() +#endforeach() -#-------------------------------------------------------------------------- -# Tests about class 0 profile 1 -# try to decode -# compare to ref file -# non regression comparison +##-------------------------------------------------------------------------- +## Tests about class 0 profile 1 +## try to decode +## compare to ref file +## non regression comparison -# Parameters and tolerances given by Table C.4 -set( C0P1_ResFactor_list "not_used;0;3;3;0;4;1;0") -set( C0P1_PEAK_list "not_used;0;35;28;2;128;128;0") -set( C0P1_MSE_list "not_used;0;74;18.8;0.550;16384;16384;0") +## Parameters and tolerances given by Table C.4 +#set( C0P1_ResFactor_list "not_used;0;3;3;0;4;1;0") +#set( C0P1_PEAK_list "not_used;0;35;28;2;128;128;0") +#set( C0P1_MSE_list "not_used;0;74;18.8;0.550;16384;16384;0") -foreach(numFileC0P1 RANGE 1 7) +#foreach(numFileC0P1 RANGE 1 7) - # Build filenames - set( filenameInput p1_0${numFileC0P1}.j2k ) - set( filenameRef c0p1_0${numFileC0P1}.pgx ) +# # Build filenames +# set( filenameInput p1_0${numFileC0P1}.j2k ) +# set( filenameRef c0p1_0${numFileC0P1}.pgx ) - # Get corresponding tests parameters - list(GET C0P1_ResFactor_list ${numFileC0P1} ResFactor) - #For Class-0 testing, we always focus on the first component only - #list(GET CP0_nbC_list ${numFileC0P0} nbComponents) - set( nbComponents "1") - list(GET C0P1_PEAK_list ${numFileC0P1} PEAK_limit) - list(GET C0P1_MSE_list ${numFileC0P1} MSE_limit) +# # Get corresponding tests parameters +# list(GET C0P1_ResFactor_list ${numFileC0P1} ResFactor) +# #For Class-0 testing, we always focus on the first component only +# #list(GET CP0_nbC_list ${numFileC0P0} nbComponents) +# set( nbComponents "1") +# list(GET C0P1_PEAK_list ${numFileC0P1} PEAK_limit) +# list(GET C0P1_MSE_list ${numFileC0P1} MSE_limit) - # Manage cases which need to try different resolution reduction - if (numFileC0P1 EQUAL 4 ) - get_filename_component(filenameRefSub ${filenameRef} NAME_WE) +# # Manage cases which need to try different resolution reduction +# if (numFileC0P1 EQUAL 4 ) +# get_filename_component(filenameRefSub ${filenameRef} NAME_WE) - #r = 0 - add_test(ETS-C0P1-${filenameInput}-r0-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}-r0.pgx - -r 0 - ) +# #r = 0 +# add_test(ETS-C0P1-${filenameInput}-r0-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}-r0.pgx +# -r 0 +# ) - add_test(ETS-C0P1-${filenameInput}-r0-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx - -t ${TEMP}/c0${filenameInput}-r0.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P1-${filenameInput}-r0-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx +# -t ${TEMP}/c0${filenameInput}-r0.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P1-${filenameInput}-r0-compare2ref - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r0-decode) +# set_tests_properties(ETS-C0P1-${filenameInput}-r0-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-r0-decode) - add_test(NR-C0P1-${filenameInput}-r0-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx - -t ${TEMP}/c0${filenameInput}-r0.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P1-${filenameInput}-r0-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx +# -t ${TEMP}/c0${filenameInput}-r0.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P1-${filenameInput}-r0-compare2base - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r0-decode) +# set_tests_properties(NR-C0P1-${filenameInput}-r0-compare2base +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-r0-decode) - #r = 3 - add_test(ETS-C0P1-${filenameInput}-r3-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}-r3.pgx - -r 3 - ) +# #r = 3 +# add_test(ETS-C0P1-${filenameInput}-r3-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}-r3.pgx +# -r 3 +# ) - add_test(ETS-C0P1-${filenameInput}-r3-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRefSub}r3.pgx - -t ${TEMP}/c0${filenameInput}-r3.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P1-${filenameInput}-r3-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRefSub}r3.pgx +# -t ${TEMP}/c0${filenameInput}-r3.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P1-${filenameInput}-r3-compare2ref - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r3-decode) +# set_tests_properties(ETS-C0P1-${filenameInput}-r3-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-r3-decode) - add_test(NR-C0P1-${filenameInput}-r3-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRefSub}-r3.pgx - -t ${TEMP}/c0${filenameInput}-r3.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P1-${filenameInput}-r3-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRefSub}-r3.pgx +# -t ${TEMP}/c0${filenameInput}-r3.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P1-${filenameInput}-r3-compare2base - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r3-decode) +# set_tests_properties(NR-C0P1-${filenameInput}-r3-compare2base +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-r3-decode) - else() +# else() - add_test(ETS-C0P1-${filenameInput}-decode - ${EXECUTABLE_OUTPUT_PATH}/opj_decompress - -i ${INPUT_CONF}/${filenameInput} - -o ${TEMP}/c0${filenameInput}.pgx - -r ${ResFactor} - ) +# add_test(ETS-C0P1-${filenameInput}-decode +# ${EXECUTABLE_OUTPUT_PATH}/opj_decompress +# -i ${INPUT_CONF}/${filenameInput} +# -o ${TEMP}/c0${filenameInput}.pgx +# -r ${ResFactor} +# ) - add_test(ETS-C0P1-${filenameInput}-compare2ref - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_CONF}/${filenameRef} - -t ${TEMP}/c0${filenameInput}.pgx - -n ${nbComponents} - -p ${PEAK_limit} - -m ${MSE_limit} - -s t_ - ) +# add_test(ETS-C0P1-${filenameInput}-compare2ref +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_CONF}/${filenameRef} +# -t ${TEMP}/c0${filenameInput}.pgx +# -n ${nbComponents} +# -p ${PEAK_limit} +# -m ${MSE_limit} +# -s t_ +# ) - set_tests_properties(ETS-C0P1-${filenameInput}-compare2ref - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-decode) +# set_tests_properties(ETS-C0P1-${filenameInput}-compare2ref +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-decode) - add_test(NR-C0P1-${filenameInput}-compare2base - ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages - -b ${BASELINE_NR}/opj_${filenameRef} - -t ${TEMP}/c0${filenameInput}.pgx - -n ${nbComponents} - -d - -s b_t_ - ) +# add_test(NR-C0P1-${filenameInput}-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRef} +# -t ${TEMP}/c0${filenameInput}.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) - set_tests_properties(NR-C0P1-${filenameInput}-compare2base - PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-decode) +# set_tests_properties(NR-C0P1-${filenameInput}-compare2base +# PROPERTIES DEPENDS +# ETS-C0P1-${filenameInput}-decode) - endif() +# endif() -endforeach() +#endforeach() #-------------------------------------------------------------------------- # Tests about class 1 profile 0