[FFmpeg-cvslog] r22168 - trunk/libavcodec/h264.c
michael
subversion
Wed Mar 3 11:57:39 CET 2010
Author: michael
Date: Wed Mar 3 11:57:38 2010
New Revision: 22168
Log:
Simplify implicit_weight table init.
Modified:
trunk/libavcodec/h264.c
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c Wed Mar 3 10:51:56 2010 (r22167)
+++ trunk/libavcodec/h264.c Wed Mar 3 11:57:38 2010 (r22168)
@@ -1435,16 +1435,14 @@ static void implicit_weight_table(H264Co
for(ref1=0; ref1 < h->ref_count[1]; ref1++){
int poc1 = h->ref_list[1][ref1].poc;
int td = av_clip(poc1 - poc0, -128, 127);
+ h->implicit_weight[ref0][ref1] = 32;
if(td){
int tb = av_clip(cur_poc - poc0, -128, 127);
int tx = (16384 + (FFABS(td) >> 1)) / td;
- int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
- if(dist_scale_factor < -64 || dist_scale_factor > 128)
- h->implicit_weight[ref0][ref1] = 32;
- else
+ int dist_scale_factor = (tb*tx + 32) >> 8;
+ if(dist_scale_factor >= -64 && dist_scale_factor <= 128)
h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
- }else
- h->implicit_weight[ref0][ref1] = 32;
+ }
}
}
}
More information about the ffmpeg-cvslog
mailing list