- curbit = (sample & ((uint64_t) (1 << p))) >> p;
- prevbit = (ctx->prevsample & ((uint64_t) (1 << p))) >> p;
+ index = ctx->probeindices[p];
+ curbit = (sample & (((uint64_t) 1) << index)) >> index;
+ prevbit = (ctx->prevsample & (((uint64_t) 1) << index)) >> index;