[FFmpeg-cvslog] r25577 - trunk/libavcodec/ffv1.c

[michael]

Author: michael
Date: Wed Oct 27 01:00:49 2010
New Revision: 25577

Log:
Make 1pass statistic collection in ffv1 put_symbol_inline() conditional to avoid slowdown when more statistic collection code is added.

Modified:
   trunk/libavcodec/ffv1.c

Modified: trunk/libavcodec/ffv1.c
==============================================================================
--- trunk/libavcodec/ffv1.c	Tue Oct 26 20:19:22 2010	(r25576)
+++ trunk/libavcodec/ffv1.c	Wed Oct 27 01:00:49 2010	(r25577)
@@ -304,7 +304,9 @@ static av_always_inline av_flatten void 
 
 #define put_rac(C,S,B) \
 do{\
+    if(rc_stat){\
     rc_stat[*(S)][B]++;\
+    }\
     put_rac(C,S,B);\
 }while(0)
 
@@ -344,8 +346,7 @@ do{\
 }
 
 static void av_noinline put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
-    uint64_t rc_stat[256][2]; //we dont bother counting header bits.
-    put_symbol_inline(c, state, v, is_signed, rc_stat);
+    put_symbol_inline(c, state, v, is_signed, NULL);
 }
 
 static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, int is_signed){
@@ -493,7 +494,11 @@ static av_always_inline int encode_line(
         diff= fold(diff, bits);
 
         if(s->ac){
+            if(s->flags & CODEC_FLAG_PASS1){
             put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat);
+            }else{
+                put_symbol_inline(c, p->state[context], diff, 1, NULL);
+            }
         }else{
             if(context == 0) run_mode=1;