Skip to content

Improving visual weighting code and implementation. #311

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

Open
aous72 wants to merge 9 commits into
base: master
Choose a base branch
from
+470 −329
Open

Improving visual weighting code and implementation. #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
568808a
For visual weighting, this replaces vector with array, to give rid of…
aous72 Jul 1, 2026
1c1f953
Fixes compilation issues
aous72 Jul 1, 2026
0c5873d
Removed dependence on std::array.
aous72 Jul 2, 2026
16f61c9
Fixes a warning.
aous72 Jul 2, 2026
bce9d5c
Rearranged visual weighting and qfactor settings
aous72 Jul 3, 2026
b6ca699
Merge branch 'master' into improve_vw
aous72 Jul 3, 2026
05673ea
Fixes warnings.
aous72 Jul 3, 2026
8b543b0
Reverts visual weights to an older version and create a factory funct…
aous72 Jul 3, 2026
771eb0e
Removes one forgotten line
aous72 Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 11 additions & 60 deletions src/apps/ojph_compress/ojph_compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,7 @@ int main(int argc, char * argv[]) {
if (!reversible && quantization_step != -1.0f)
codestream.access_qcd().set_irrev_quant(quantization_step);
if (!reversible && qfactor != -1)
codestream.access_qcd().set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
if (profile_string[0] != '\0')
codestream.set_profile(profile_string);
codestream.set_tilepart_divisions(tileparts_at_resolutions,
Expand Down Expand Up @@ -759,12 +758,8 @@ int main(int argc, char * argv[]) {
cod.set_reversible(reversible);
if (!reversible && quantization_step != -1.0f)
codestream.access_qcd().set_irrev_quant(quantization_step);
if (!reversible && qfactor != -1) {
ojph::param_qcd qcd = codestream.access_qcd();
qcd.set_qfactor(0, ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
qcd.set_qfactor(1, ojph::param_qcd::OJPH_COMP_CB, (ojph::ui8)qfactor);
qcd.set_qfactor(2, ojph::param_qcd::OJPH_COMP_CR, (ojph::ui8)qfactor);
}
if (!reversible && qfactor != -1)
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
codestream.set_planar(false);
if (profile_string[0] != '\0')
codestream.set_profile(profile_string);
Expand Down Expand Up @@ -843,20 +838,9 @@ int main(int argc, char * argv[]) {
cod.set_color_transform(employ_color_transform == 1);
}
cod.set_reversible(reversible);
if (!reversible && qfactor != -1) {
ojph::param_qcd qcd = codestream.access_qcd();
if (num_comps == 1) {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
} else {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
qcd.set_qfactor(1,
ojph::param_qcd::OJPH_COMP_CB, (ojph::ui8)qfactor);
qcd.set_qfactor(2,
ojph::param_qcd::OJPH_COMP_CR, (ojph::ui8)qfactor);
}
} else if (!reversible) {
if (!reversible && qfactor != -1)
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
else if (!reversible) {
const float min_step = 1.0f / 16384.0f;
if (quantization_step == -1.0f)
quantization_step = min_step;
Expand Down Expand Up @@ -939,18 +923,8 @@ int main(int argc, char * argv[]) {
OJPH_ERROR(0x010000A3,
"-qfactor is only supported for images with 1 or 3 "
"components\n");
ojph::param_qcd qcd = codestream.access_qcd();
if (num_comps == 1) {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
} else {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
qcd.set_qfactor(1,
ojph::param_qcd::OJPH_COMP_CB, (ojph::ui8)qfactor);
qcd.set_qfactor(2,
ojph::param_qcd::OJPH_COMP_CR, (ojph::ui8)qfactor);
}
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);

}
codestream.set_planar(false);
if (profile_string[0] != '\0')
Expand Down Expand Up @@ -1042,18 +1016,7 @@ int main(int argc, char * argv[]) {
OJPH_ERROR(0x010000A4,
"-qfactor is only supported for images with 1 or 3 "
"components\n");
ojph::param_qcd qcd = codestream.access_qcd();
if (num_components == 1) {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
} else {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
qcd.set_qfactor(1,
ojph::param_qcd::OJPH_COMP_CB, (ojph::ui8)qfactor);
qcd.set_qfactor(2,
ojph::param_qcd::OJPH_COMP_CR, (ojph::ui8)qfactor);
}
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
}
codestream.set_planar(true);
if (profile_string[0] != '\0')
Expand Down Expand Up @@ -1108,8 +1071,7 @@ int main(int argc, char * argv[]) {
if (!reversible && quantization_step != -1.0f)
codestream.access_qcd().set_irrev_quant(quantization_step);
if (!reversible && qfactor != -1)
codestream.access_qcd().set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
codestream.set_planar(true);
if (profile_string[0] != '\0')
codestream.set_profile(profile_string);
Expand Down Expand Up @@ -1155,18 +1117,7 @@ int main(int argc, char * argv[]) {
OJPH_ERROR(0x010000A5,
"-qfactor is only supported for images with 1 or 3 "
"components\n");
ojph::param_qcd qcd = codestream.access_qcd();
if (num_comps == 1) {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
} else {
qcd.set_qfactor(0,
ojph::param_qcd::OJPH_COMP_Y, (ojph::ui8)qfactor);
qcd.set_qfactor(1,
ojph::param_qcd::OJPH_COMP_CB, (ojph::ui8)qfactor);
qcd.set_qfactor(2,
ojph::param_qcd::OJPH_COMP_CR, (ojph::ui8)qfactor);
}
codestream.access_qcd().set_qfactor((ojph::ui8)qfactor);
}
codestream.set_planar(false);
if (profile_string[0] != '\0')
Expand Down
Loading
Loading