diff options
| author | Jeff Downs <heydowns@somuchpressure.net> | 2011-07-06 11:54:36 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-08-19 14:36:52 +0200 |
| commit | 87cf70eb237e7586cc7399627dafa1b980ec0b7d (patch) | |
| tree | 4a834af340b5a881a8813fceed1400fab3641b20 | |
| parent | 29a09eae9a827f4dbc9c4517180d8fe2ecef321a (diff) | |
| download | ffmpeg-87cf70eb237e7586cc7399627dafa1b980ec0b7d.tar.gz | |
h264: correct implicit weight table computation for long ref pics
Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/h264.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c2229ffcce..4feef4b459 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2157,15 +2157,17 @@ static void implicit_weight_table(H264Context *h, int field){ for(ref0=ref_start; ref0 < ref_count0; ref0++){ int poc0 = h->ref_list[0][ref0].poc; for(ref1=ref_start; ref1 < ref_count1; ref1++){ - int poc1 = h->ref_list[1][ref1].poc; - int td = av_clip(poc1 - poc0, -128, 127); - int w= 32; - if(td){ - int tb = av_clip(cur_poc - poc0, -128, 127); - int tx = (16384 + (FFABS(td) >> 1)) / td; - int dist_scale_factor = (tb*tx + 32) >> 8; - if(dist_scale_factor >= -64 && dist_scale_factor <= 128) - w = 64 - dist_scale_factor; + 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 td = av_clip(poc1 - poc0, -128, 127); + if(td){ + int tb = av_clip(cur_poc - poc0, -128, 127); + int tx = (16384 + (FFABS(td) >> 1)) / td; + int dist_scale_factor = (tb*tx + 32) >> 8; + if(dist_scale_factor >= -64 && dist_scale_factor <= 128) + w = 64 - dist_scale_factor; + } } if(field<0){ h->implicit_weight[ref0][ref1][0]= |