Message ID | 05a7be47f7720633581f36a92ca6cafa35ec6855.1609815680.git.pross@xvid.org |
---|---|
State | Accepted |
Commit | 63be96414b3ee7d3a9edbf0ffca11997ed520a4e |
Headers | show |
Series | [FFmpeg-devel,1/2] avcodec/dvenc: dv100_weight_shift never used | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
Peter Ross: > --- > libavcodec/dvenc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c > index 0dc290642e..233e2b68c7 100644 > --- a/libavcodec/dvenc.c > +++ b/libavcodec/dvenc.c > @@ -318,9 +318,8 @@ static const int dv100_qstep_inv[16] = { > 65536, 65536, 32768, 21845, 16384, 13107, 10923, 9362, 8192, 4096, 3641, 3277, 2979, 2731, 2341, 1260, > }; > > -/* DV100 weights are pre-zigzagged, inverted and multiplied by 2^(dv100_weight_shift) > +/* DV100 weights are pre-zigzagged, inverted and multiplied by 2^16 > (in DV100 the AC components are divided by the spec weights) */ > -static const int dv100_weight_shift = 16; > static const int dv_weight_1080[2][64] = { > { 8192, 65536, 65536, 61681, 61681, 61681, 58254, 58254, > 58254, 58254, 58254, 58254, 55188, 58254, 58254, 55188, > > LGTM. - Andreas
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 0dc290642e..233e2b68c7 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -318,9 +318,8 @@ static const int dv100_qstep_inv[16] = { 65536, 65536, 32768, 21845, 16384, 13107, 10923, 9362, 8192, 4096, 3641, 3277, 2979, 2731, 2341, 1260, }; -/* DV100 weights are pre-zigzagged, inverted and multiplied by 2^(dv100_weight_shift) +/* DV100 weights are pre-zigzagged, inverted and multiplied by 2^16 (in DV100 the AC components are divided by the spec weights) */ -static const int dv100_weight_shift = 16; static const int dv_weight_1080[2][64] = { { 8192, 65536, 65536, 61681, 61681, 61681, 58254, 58254, 58254, 58254, 58254, 58254, 55188, 58254, 58254, 55188,