EBML fix for ARMv7

This commit is contained in:
Thulinma 2018-03-27 15:43:41 +02:00
parent f48933a50d
commit dc12c1ea78
2 changed files with 14 additions and 14 deletions

View file

@ -55,13 +55,13 @@ namespace EBML{
void UniInt::writeInt(char *p, const uint64_t val){ void UniInt::writeInt(char *p, const uint64_t val){
switch (writeSize(val)){ switch (writeSize(val)){
case 1: p[0] = val | 0x80; break; case 1: p[0] = val | 0x80; break;
case 2: Bit::htobs(p, val | 0x4000); break; case 2: Bit::htobs(p, val | 0x4000ull); break;
case 3: Bit::htob24(p, val | 0x200000); break; case 3: Bit::htob24(p, val | 0x200000ull); break;
case 4: Bit::htobl(p, val | 0x10000000); break; case 4: Bit::htobl(p, val | 0x10000000ull); break;
case 5: Bit::htob40(p, val | 0x800000000); break; case 5: Bit::htob40(p, val | 0x800000000ull); break;
case 6: Bit::htob48(p, val | 0x40000000000); break; case 6: Bit::htob48(p, val | 0x40000000000ull); break;
case 7: Bit::htob56(p, val | 0x2000000000000); break; case 7: Bit::htob56(p, val | 0x2000000000000ull); break;
case 8: Bit::htobll(p, val | 0x100000000000000); break; case 8: Bit::htobll(p, val | 0x100000000000000ull); break;
} }
} }

View file

@ -19,19 +19,19 @@ namespace EBML{
} }
uint8_t sizeUInt(const uint64_t val){ uint8_t sizeUInt(const uint64_t val){
if (val >= 0x100000000000000){ if (val >= 0x100000000000000ull){
return 8; return 8;
}else if (val >= 0x1000000000000){ }else if (val >= 0x1000000000000ull){
return 7; return 7;
}else if (val >= 0x10000000000){ }else if (val >= 0x10000000000ull){
return 6; return 6;
}else if (val >= 0x100000000){ }else if (val >= 0x100000000ull){
return 5; return 5;
}else if (val >= 0x1000000){ }else if (val >= 0x1000000ull){
return 4; return 4;
}else if (val >= 0x10000){ }else if (val >= 0x10000ull){
return 3; return 3;
}else if (val >= 0x100){ }else if (val >= 0x100ull){
return 2; return 2;
}else{ }else{
return 1; return 1;