comparison cabac.h @ 3984:bb186452e7da libavcodec

BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER

3983:fec25fd9febf

//#undef NDEBUG
#include <assert.h>

#define CABAC_BITS 16
#define CABAC_MASK ((1<<CABAC_BITS)-1)
#define BRANCHLESS_CABAD 1

typedef struct CABACContext{
    int low;
    int range;
    int outstanding_count;

#define LPS_STATE   "12+2*65*4"
#define MPS_STATE   "12+2*65*4+2*64"
#define BYTESTART   "12+2*65*4+4*64"
#define BYTE        "16+2*65*4+4*64"
#define BYTEEND     "20+2*65*4+4*64"
#ifndef BRANCHLESS_CABAD
    asm volatile(
        "movzbl (%1), %%eax                     \n\t"
        "movl "RANGE    "(%2), %%ebx            \n\t"
        "movl "RANGE    "(%2), %%edx            \n\t"
        "shrl $23, %%ebx                        \n\t"

    int s = *state;
    int RangeLPS= c->lps_range[s][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1);
    int bit, lps_mask attribute_unused;

    c->range -= RangeLPS;
#ifndef BRANCHLESS_CABAD
    if(c->low < c->range){
        bit= s&1;
        *state= c->mps_state[s];
        renorm_cabac_decoder_once(c);
    }else{

3984:bb186452e7da

//#undef NDEBUG
#include <assert.h>

#define CABAC_BITS 16
#define CABAC_MASK ((1<<CABAC_BITS)-1)
#define BRANCHLESS_CABAC_DECODER 1

typedef struct CABACContext{
    int low;
    int range;
    int outstanding_count;

#define LPS_STATE   "12+2*65*4"
#define MPS_STATE   "12+2*65*4+2*64"
#define BYTESTART   "12+2*65*4+4*64"
#define BYTE        "16+2*65*4+4*64"
#define BYTEEND     "20+2*65*4+4*64"
#ifndef BRANCHLESS_CABAC_DECODER
    asm volatile(
        "movzbl (%1), %%eax                     \n\t"
        "movl "RANGE    "(%2), %%ebx            \n\t"
        "movl "RANGE    "(%2), %%edx            \n\t"
        "shrl $23, %%ebx                        \n\t"

    int s = *state;
    int RangeLPS= c->lps_range[s][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1);
    int bit, lps_mask attribute_unused;

    c->range -= RangeLPS;
#ifndef BRANCHLESS_CABAC_DECODER
    if(c->low < c->range){
        bit= s&1;
        *state= c->mps_state[s];
        renorm_cabac_decoder_once(c);
    }else{