Skip to content

Commit b33083a

Browse files
committed
AVX2 is done. Bug fix for SPqcd.
1 parent e803914 commit b33083a

File tree

3 files changed

+269
-78
lines changed

3 files changed

+269
-78
lines changed

src/core/codestream/ojph_params_local.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,12 +646,15 @@ namespace ojph {
646646
ui8 decode_SPqcd(ui8 v) const
647647
{
648648
if (old_SPqcd) return (ui8)(v >> reversible_SPqcd_shift); // old
649-
else return (ui8)((v << 6) | (v >> 3)); // new
649+
else {
650+
v = v & 0b11111011;
651+
return (ui8)((v << 5) | (v >> 3)); // new
652+
}
650653
}
651654
ui8 encode_SPqcd(ui8 v) const
652655
{
653656
if (old_SPqcd) return (ui8)(v << reversible_SPqcd_shift); // old
654-
else return (ui8)((v >> 6) | (v << 3)); // new
657+
else return (ui8)((v >> 5) | (v << 3)); // new
655658
}
656659
protected:
657660
ui16 Lqcd;

src/core/transform/ojph_colour.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ namespace ojph {
163163
#ifndef OJPH_DISABLE_AVX2
164164
if (get_cpu_ext_level() >= X86_CPU_EXT_LEVEL_AVX2)
165165
{
166-
//rev_convert = avx2_rev_convert;
167-
//rev_convert_nlt_type3 = avx2_rev_convert_nlt_type3;
168-
// rct_forward = avx2_rct_forward;
166+
rev_convert = avx2_rev_convert;
167+
rev_convert_nlt_type3 = avx2_rev_convert_nlt_type3;
168+
rct_forward = avx2_rct_forward;
169169
rct_backward = avx2_rct_backward;
170170
}
171171
#endif // !OJPH_DISABLE_AVX2

0 commit comments

Comments
 (0)