X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fbs.h;h=a30cf3431f09c5818587bf63eb7afe1f8651377b;hb=79f4e3e270ebffc8663f35e9959abdd369b6f914;hp=22f5347431b274029663e2edd993be75ab425d5a;hpb=4ee9642aef80b64f7b726ad245e6ab2ea631e896;p=x264

diff --git a/common/bs.h b/common/bs.h
index 22f53474..a30cf343 100644
--- a/common/bs.h
+++ b/common/bs.h
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * bs.h :
  *****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: bs.h,v 1.1 2004/06/03 19:27:06 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
  *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
+ *          Fiona Glaser <fiona@x264.com>
+ *          Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,224 +19,228 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
  *****************************************************************************/
 
 #ifndef X264_BS_H
 #define X264_BS_H
 
+typedef struct
+{
+    uint8_t i_bits;
+    uint8_t i_size;
+} vlc_t;
+
 typedef struct bs_s
 {
     uint8_t *p_start;
     uint8_t *p;
     uint8_t *p_end;
 
+    intptr_t cur_bits;
     int     i_left;    /* i_count number of available bits */
     int     i_bits_encoded; /* RD only */
 } bs_t;
 
+extern const vlc_t x264_coeff_token[5][17*4];
+extern const vlc_t x264_total_zeros[15][16];
+extern const vlc_t x264_total_zeros_dc[3][4];
+extern const vlc_t x264_run_before[7][15];
+
 static inline void bs_init( bs_t *s, void *p_data, int i_data )
 {
-    s->p_start = p_data;
-    s->p       = p_data;
-    s->p_end   = s->p + i_data;
-    s->i_left  = 8;
+    int offset = ((intptr_t)p_data & (WORD_SIZE-1));
+    s->p       = s->p_start = (uint8_t*)p_data - offset;
+    s->p_end   = (uint8_t*)p_data + i_data;
+    s->i_left  = offset ? 8*offset : (WORD_SIZE*8);
+    s->cur_bits = endian_fix( *(intptr_t*)s->p );
 }
 static inline int bs_pos( bs_t *s )
 {
-    return( 8 * ( s->p - s->p_start ) + 8 - s->i_left );
+    return( 8 * (s->p - s->p_start) + (WORD_SIZE*8) - s->i_left );
+}
+
+/* Write the rest of cur_bits to the bitstream; results in a bitstream no longer 32/64-bit aligned. */
+static inline void bs_flush( bs_t *s )
+{
+    *(intptr_t*)s->p = endian_fix( s->cur_bits << s->i_left );
+    s->p += WORD_SIZE - s->i_left / 8;
+    s->i_left = WORD_SIZE*8;
 }
 
 static inline void bs_write( bs_t *s, int i_count, uint32_t i_bits )
 {
-    if( s->p >= s->p_end - 4 )
-        return;
-    while( i_count > 0 )
+    if( WORD_SIZE == 8 )
+    {
+        s->cur_bits = (s->cur_bits << i_count) | i_bits;
+        s->i_left -= i_count;
+        if( s->i_left <= 32 )
+        {
+            *(uint32_t*)s->p = endian_fix( s->cur_bits << s->i_left );
+            s->i_left += 32;
+            s->p += 4;
+        }
+    }
+    else
     {
-        if( i_count < 32 )
-            i_bits &= (1<<i_count)-1;
         if( i_count < s->i_left )
         {
-            *s->p = (*s->p << i_count) | i_bits;
+            s->cur_bits = (s->cur_bits << i_count) | i_bits;
             s->i_left -= i_count;
-            break;
         }
         else
         {
-            *s->p = (*s->p << s->i_left) | (i_bits >> (i_count - s->i_left));
             i_count -= s->i_left;
-            s->p++;
-            s->i_left = 8;
+            s->cur_bits = (s->cur_bits << s->i_left) | (i_bits >> i_count);
+            *(uint32_t*)s->p = endian_fix( s->cur_bits );
+            s->p += 4;
+            s->cur_bits = i_bits;
+            s->i_left = 32 - i_count;
         }
     }
 }
 
+/* Special case to eliminate branch in normal bs_write. */
+/* Golomb never writes an even-size code, so this is only used in slice headers. */
+static inline void bs_write32( bs_t *s, uint32_t i_bits )
+{
+    bs_write( s, 16, i_bits >> 16 );
+    bs_write( s, 16, i_bits );
+}
+
 static inline void bs_write1( bs_t *s, uint32_t i_bit )
 {
-    if( s->p < s->p_end )
+    s->cur_bits <<= 1;
+    s->cur_bits |= i_bit;
+    s->i_left--;
+    if( s->i_left == WORD_SIZE*8-32 )
     {
-        *s->p <<= 1;
-        *s->p |= i_bit;
-        s->i_left--;
-        if( s->i_left == 0 )
-        {
-            s->p++;
-            s->i_left = 8;
-        }
+        *(uint32_t*)s->p = endian_fix32( s->cur_bits );
+        s->p += 4;
+        s->i_left = WORD_SIZE*8;
     }
 }
 
 static inline void bs_align_0( bs_t *s )
 {
-    if( s->i_left != 8 )
+    if( s->i_left&7 )
     {
-        *s->p <<= s->i_left;
-        s->i_left = 8;
-        s->p++;
+        s->cur_bits <<= s->i_left&7;
+        s->i_left &= ~7;
     }
+    bs_flush( s );
 }
 static inline void bs_align_1( bs_t *s )
 {
-    if( s->i_left != 8 )
+    if( s->i_left&7 )
     {
-        *s->p <<= s->i_left;
-        *s->p |= (1 << s->i_left) - 1;
-        s->i_left = 8;
-        s->p++;
+        s->cur_bits <<= s->i_left&7;
+        s->cur_bits |= (1 << (s->i_left&7)) - 1;
+        s->i_left &= ~7;
     }
+    bs_flush( s );
 }
-static inline void bs_align( bs_t *s )
-{
-    bs_align_0( s );
-}
-
-
 
 /* golomb functions */
 
-static inline void bs_write_ue( bs_t *s, unsigned int val )
+static const uint8_t x264_ue_size_tab[256] =
 {
-    int i_size = 0;
-    static const uint8_t i_size0_255[256] =
-    {
-        1,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-        6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-        7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-        8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-        8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-        8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-        8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-    };
-
-    if( val == 0 )
+     1, 1, 3, 3, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7,
+     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+    11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+    13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+    13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+    13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+    13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+    15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+};
+
+static inline void bs_write_ue_big( bs_t *s, unsigned int val )
+{
+    int size = 0;
+    int tmp = ++val;
+    if( tmp >= 0x10000 )
     {
-        bs_write1( s, 1 );
+        size = 32;
+        tmp >>= 16;
     }
-    else
+    if( tmp >= 0x100 )
     {
-        unsigned int tmp = ++val;
-
-        if( tmp >= 0x00010000 )
-        {
-            i_size += 16;
-            tmp >>= 16;
-        }
-        if( tmp >= 0x100 )
-        {
-            i_size += 8;
-            tmp >>= 8;
-        }
-        i_size += i_size0_255[tmp];
-
-        bs_write( s, 2 * i_size - 1, val );
+        size += 16;
+        tmp >>= 8;
     }
+    size += x264_ue_size_tab[tmp];
+    bs_write( s, size>>1, 0 );
+    bs_write( s, (size>>1)+1, val );
+}
+
+/* Only works on values under 255. */
+static inline void bs_write_ue( bs_t *s, int val )
+{
+    bs_write( s, x264_ue_size_tab[val+1], val+1 );
 }
 
 static inline void bs_write_se( bs_t *s, int val )
 {
-    bs_write_ue( s, val <= 0 ? -val * 2 : val * 2 - 1);
+    int size = 0;
+    int tmp = val = val <= 0 ? -val*2+1 : val*2;
+    if( tmp >= 0x100 )
+    {
+        size = 16;
+        tmp >>= 8;
+    }
+    size += x264_ue_size_tab[tmp];
+    bs_write( s, size, val );
 }
 
 static inline void bs_write_te( bs_t *s, int x, int val )
 {
     if( x == 1 )
-    {
-        bs_write1( s, 1&~val );
-    }
+        bs_write1( s, 1^val );
     else if( x > 1 )
-    {
         bs_write_ue( s, val );
-    }
 }
 
 static inline void bs_rbsp_trailing( bs_t *s )
 {
     bs_write1( s, 1 );
-    if( s->i_left != 8 )
-    {
-        bs_write( s, s->i_left, 0x00 );
-    }
+    bs_flush( s );
 }
 
 static inline int bs_size_ue( unsigned int val )
 {
-    static const uint8_t i_size0_254[255] =
-    {
-        1, 3, 3, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7,
-        9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
-        11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-        11,11,11,11,11,11,11,11,11,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-        13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-        13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
-        13,13,13,13,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-        15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-        15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-        15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-        15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
-        15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15
-    };
+    return x264_ue_size_tab[val+1];
+}
 
+static inline int bs_size_ue_big( unsigned int val )
+{
     if( val < 255 )
-    {
-        return i_size0_254[val];
-    }
+        return x264_ue_size_tab[val+1];
     else
-    {
-        int i_size = 0;
-
-        val++;
-
-        if( val >= 0x10000 )
-        {
-            i_size += 32;
-            val = (val >> 16) - 1;
-        }
-        if( val >= 0x100 )
-        {
-            i_size += 16;
-            val = (val >> 8) - 1;
-        }
-        return i_size0_254[val] + i_size;
-    }
+        return x264_ue_size_tab[(val+1)>>8] + 16;
 }
 
 static inline int bs_size_se( int val )
 {
-    return bs_size_ue( val <= 0 ? -val * 2 : val * 2 - 1);
+    return bs_size_ue_big( val <= 0 ? -val*2 : val*2-1 );
 }
 
 static inline int bs_size_te( int x, int val )
 {
     if( x == 1 )
-    {
         return 1;
-    }
     else if( x > 1 )
-    {
-        return bs_size_ue( val );
-    }
-    return 0;
+        return x264_ue_size_tab[val+1];
+    else
+        return 0;
 }
 
 #endif