[Ffmpeg-cvslog] r6623 - in trunk/libavcodec: cabac.c cabac.h

[diego]

Author: diego
Date: Tue Oct 10 10:16:41 2006
New Revision: 6623

Modified:
   trunk/libavcodec/cabac.c
   trunk/libavcodec/cabac.h

Log:
BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER


Modified: trunk/libavcodec/cabac.c
==============================================================================
--- trunk/libavcodec/cabac.c	(original)
+++ trunk/libavcodec/cabac.c	Tue Oct 10 10:16:41 2006
@@ -133,7 +133,7 @@
         c->mps_state[2*i+1]= 2*mps_state[i]+1;
 
         if( i ){
-#ifdef BRANCHLESS_CABAD
+#ifdef BRANCHLESS_CABAC_DECODER
             c->mps_state[-2*i-1]= 2*lps_state[i]+0; //FIXME yes this is not valid C but iam lazy, cleanup welcome
             c->mps_state[-2*i-2]= 2*lps_state[i]+1;
         }else{

Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	(original)
+++ trunk/libavcodec/cabac.h	Tue Oct 10 10:16:41 2006
@@ -31,7 +31,7 @@
 
 #define CABAC_BITS 16
 #define CABAC_MASK ((1<<CABAC_BITS)-1)
-#define BRANCHLESS_CABAD 1
+#define BRANCHLESS_CABAC_DECODER 1
 
 typedef struct CABACContext{
     int low;
@@ -375,7 +375,7 @@
 #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
+#ifndef BRANCHLESS_CABAC_DECODER
     asm volatile(
         "movzbl (%1), %%eax                     \n\t"
         "movl "RANGE    "(%2), %%ebx            \n\t"
@@ -523,7 +523,7 @@
     int bit, lps_mask attribute_unused;
 
     c->range -= RangeLPS;
-#ifndef BRANCHLESS_CABAD
+#ifndef BRANCHLESS_CABAC_DECODER
     if(c->low < c->range){
         bit= s&1;
         *state= c->mps_state[s];