Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264 - Correct implicit weight table computation for long ref pics

Browse Source 
Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.
pull/2/head
Jeff Downs 14 years ago
parent e80e2d5ba1
commit 4105443872
1 changed files with 3 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/h264.c

4
libavcodec/h264.c
Unescape View File

@ -2174,9 +2174,10 @@ static void implicit_weight_table(H264Context *h, int field){
for(ref0=ref_start; ref0 < ref_count0; ref0++){ for(ref0=ref_start; ref0 < ref_count0; ref0++){
int poc0 = h->ref_list[0][ref0].poc; int poc0 = h->ref_list[0][ref0].poc;
for(ref1=ref_start; ref1 < ref_count1; ref1++){ for(ref1=ref_start; ref1 < ref_count1; ref1++){
int w= 32;
if (!h->ref_list[0][ref0].long_ref && !h->ref_list[1][ref1].long_ref){
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);
int w= 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;
@ -2184,6 +2185,7 @@ static void implicit_weight_table(H264Context *h, int field){
if(dist_scale_factor >= -64 && dist_scale_factor <= 128) if(dist_scale_factor >= -64 && dist_scale_factor <= 128)
w = 64 - dist_scale_factor; w = 64 - dist_scale_factor;
} }
}
if(field<0){ if(field<0){
h->implicit_weight[ref0][ref1][0]= h->implicit_weight[ref0][ref1][0]=
h->implicit_weight[ref0][ref1][1]= w; h->implicit_weight[ref0][ref1][1]= w;

Write Preview
Loading…
Cancel
Save