highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cabac: Ensure 2-byte cabac loads are on 2-byte boundry

Browse Source 
Ensure that cabac init sets the bitstream pointer to an even value.
It is often faster to load from an aligned boundry

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
John Cox
2016-01-20 17:48:30 +00:00
committed by Michael Niedermayer
parent 17399f6a9f
commit 48f80831ba
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/cabac.c
View File

@@ -183,10 +183,19 @@ int ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){
#if CABAC_BITS == 16 #if CABAC_BITS == 16
c->low = (*c->bytestream++)<<18; c->low = (*c->bytestream++)<<18;
c->low+= (*c->bytestream++)<<10; c->low+= (*c->bytestream++)<<10;
// Keep our fetches on a 2-byte boundry as this should avoid ever having to
// do unaligned loads if the compiler (or asm) optimises the double byte
// load into a single instruction
if(((uintptr_t)c->bytestream & 1) == 0) {
c->low += (1 << 9);
}
else {
c->low += ((*c->bytestream++) << 2) + 2;
}
#else #else
c->low = (*c->bytestream++)<<10; c->low = (*c->bytestream++)<<10;
#endif
c->low+= ((*c->bytestream++)<<2) + 2; c->low+= ((*c->bytestream++)<<2) + 2;
#endif
c->range= 0x1FE; c->range= 0x1FE;
if ((c->range<<(CABAC_BITS+1)) < c->low) if ((c->range<<(CABAC_BITS+1)) < c->low)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;