add a comment to indicate which #endif belong to which #define

[ffmpeg] / libavcodec / rangecoder.h

diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 1d68b9ac9ae815610398c458ad42c4ab2837873f..298928ad4395d1d429a6b23df006713a6fd723e8 100644 (file)
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -2,27 +2,36 @@
  * Range coder
  * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
- 
+
 /**
  * @file rangecoder.h
  * Range coder.
  */
 
+#ifndef AVCODEC_RANGECODER_H
+#define AVCODEC_RANGECODER_H
+
+#include <stdint.h>
+#include <assert.h>
+#include "common.h"
+
 typedef struct RangeCoder{
     int low;
     int range;
@@ -58,12 +67,19 @@ static inline void renorm_encoder(RangeCoder *c){
         }else{
             c->outstanding_count++;
         }
-        
+
         c->low = (c->low & 0xFF)<<8;
         c->range <<= 8;
     }
 }
 
+static inline int get_rac_count(RangeCoder *c){
+    int x= c->bytestream - c->bytestream_start + c->outstanding_count;
+    if(c->outstanding_byte >= 0)
+        x++;
+    return 8*x - av_log2(c->range);
+}
+
 static inline void put_rac(RangeCoder *c, uint8_t * const state, int bit){
     int range1= (c->range * (*state)) >> 8;
 
@@ -78,7 +94,7 @@ static inline void put_rac(RangeCoder *c, uint8_t * const state, int bit){
         c->range = range1;
         *state= c->one_state[*state];
     }
-    
+
     renorm_encoder(c);
 }
 
@@ -94,8 +110,8 @@ static inline void refill(RangeCoder *c){
 
 static inline int get_rac(RangeCoder *c, uint8_t * const state){
     int range1= (c->range * (*state)) >> 8;
-    int one_mask;
-    
+    int av_unused one_mask;
+
     c->range -= range1;
 #if 1
     if(c->low < c->range){
@@ -111,15 +127,16 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
     }
 #else
     one_mask= (c->range - c->low-1)>>31;
-    
+
     c->low -= c->range & one_mask;
     c->range += (range1 - c->range) & one_mask;
-    
+
     *state= c->zero_state[(*state) + (256&one_mask)];
-    
+
     refill(c);
 
     return one_mask&1;
 #endif
 }
 
+#endif // AVCODEC_RANGECODER_H