Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/ffv1enc.c | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index c3b3b926adf..004ea73e06b 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1408,17 +1408,30 @@ static void encode_float32_remap(FFV1Context *f,
FFV1SliceContext *sc,
s.i = 0;
s.p = p;
- s.mul_count = 1;
-
+ for(int v = 0; v< 512; v++) {
+ if (v >= 0x378/8 && v <= 23 + 0x378/8) {
+ s.mul[v] = -(0x800080 >> (v - 0x378/8));
+ } else
+ s.mul[v] = -1;
+ }
for (int i= 0; i<s.pixel_num; i++) {
int64_t val = unit[p][i].val;
if (val != last_val) {
av_assert2(last_val < val);
for(int si= 0; si < FF_ARRAY_ELEMS(score_tab); si++) {
int64_t delta = val - last_val;
- int mul = last_val < 0 ? 1 : (1<<si);
- int64_t cost = FFMAX((delta + mul/2) / mul, 1);
- score_tab[si] += log2(cost) + fabs(delta - cost*mul);
+ int mul;
+ int64_t cost;
+
+ if (last_val < 0) {
+ mul = 1;
+ } else if (si + 1 == FF_ARRAY_ELEMS(score_tab)) {
+ mul = -s.mul[ (last_val + 1) >> (32-9) ];
+ } else
+ mul = 1<<si;
+
+ cost = FFMAX((delta + mul/2) / mul, 1);
+ score_tab[si] += log2(cost) + log2(fabs(delta -
cost*mul)+1);
}
last_val = val;
}
@@ -1428,7 +1441,12 @@ static void encode_float32_remap(FFV1Context *f,
FFV1SliceContext *sc,
if (score_tab[si] < score_tab[ best_index ])
best_index = si;
}
- s.mul[0] = -1 << best_index;
+ if (best_index + 1 < FF_ARRAY_ELEMS(score_tab)) {
+ s.mul[0] = -1 << best_index;
+ s.mul_count = 1;
+ } else {
+ s.mul_count = 512;
+ }
s.mul[s.mul_count] = 1;
encode_float32_remap_segment(sc, unit, &s, 1, 1);
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
