generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify implicit_weight table init.

Browse Source 
Originally committed as revision 22168 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2010-03-03 10:57:38 +00:00
parent 54063e37c1
commit 72f86ec013
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264.c
View File

@@ -1435,16 +1435,14 @@ static void implicit_weight_table(H264Context *h){
for(ref1=0; ref1 < h->ref_count[1]; ref1++){ for(ref1=0; ref1 < h->ref_count[1]; ref1++){
int poc1 = h->ref_list[1][ref1].poc; int poc1 = h->ref_list[1][ref1].poc;
int td = av_clip(poc1 - poc0, -128, 127); int td = av_clip(poc1 - poc0, -128, 127);
h->implicit_weight[ref0][ref1] = 32;
if(td){ if(td){
int tb = av_clip(cur_poc - poc0, -128, 127); int tb = av_clip(cur_poc - poc0, -128, 127);
int tx = (16384 + (FFABS(td) >> 1)) / td; int tx = (16384 + (FFABS(td) >> 1)) / td;
int dist_scale_factor = av_clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; int dist_scale_factor = (tb*tx + 32) >> 8;
if(dist_scale_factor < -64 || dist_scale_factor > 128) if(dist_scale_factor >= -64 && dist_scale_factor <= 128)
h->implicit_weight[ref0][ref1] = 32;
else
h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
}else }
h->implicit_weight[ref0][ref1] = 32;
} }
} }
} }