Skip to content
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.

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

T1: fix BYPASS/LAZY, TERMALL/RESTART and PTERM/ERTERM encoding modes (#674) #947

Closed
wants to merge 1 commit into from

Conversation

rouault
Copy link
Collaborator

@rouault rouault commented Jun 9, 2017

There were a number of defects regarding when and how the termination of
passes had to done and the computation of their rate.

…uclouvain#674)

There were a number of defects regarding when and how the termination of
passes had to done and the computation of their rate.
@rouault
Copy link
Collaborator Author

rouault commented Jun 9, 2017

Note: the build of the pull request from rouault/fix_bypass_pterm_termall at https://travis-ci.org/uclouvain/openjpeg/builds/241107896 failed since it identifies the branch as 'master' and thus pulls the 'master' branch of the openjpeg-data repository, instead of the updated 'fix_bypass_pterm_termall' branch from the uclouvain repo. I've thus pushed the branch into the uclouvain repo and build of this branch succeeds: https://travis-ci.org/uclouvain/openjpeg/builds/241109714 + https://ci.appveyor.com/project/detonin/openjpeg/build/2.1.1.612

Note 2: uclouvain/openjpeg-data@be376b3 modifies the expected result of the following test step : "opj_compress -i @INPUT_NR_PATH@/Bretagne2.ppm -o @TEMP_PATH@/Bretagne2_3.j2k -EPH -M 38". Indeed -M 38 corresponds to 32 (SEGSYM) + 4 (TERMALL) + 2 (RESET), and TERMALL was broken.

Now he md5sum of the raw images after encoding + decoding is the same (except for Bretagne2_4 which use a lossy parameter -r 800), including for the new tests that test most combinations of encoding flags.

$ md5sum data/baseline/nonregression/opj_Bretagne2_*.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_0-ENC-4.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_1-ENC-5.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_2-ENC-6.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_3-ENC-7.raw
af8e7f823f8ed231a98ecd41076919f3  data/baseline/nonregression/opj_Bretagne2_4-ENC-8.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_5-ENC-24.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_bypass-ENC-115.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_bypass_pterm-ENC-121.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_bypass_termall-ENC-120.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_bypass_termall_pterm-ENC-123.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_bypass_vsc_reset_termall_pterm_segsym-ENC-124.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_pterm-ENC-118.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_reset-ENC-116.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_segsym-ENC-119.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_termall-ENC-117.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_termall_pterm-ENC-122.raw
2bd2820ddbad401df140073326007b35  data/baseline/nonregression/opj_Bretagne2_vsc-ENC-114.raw

@rouault
Copy link
Collaborator Author

rouault commented Jun 13, 2017

Superseded by #949 that includes it

@rouault rouault closed this Jun 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants