[FFmpeg-devel] [PATCH] libavcodec/vp9:reduce memory copy of prob.coef

[FFmpeg-devel] [PATCH] libavcodec/vp9:reduce memory copy of prob.coef

[xufuji456]

---
 libavcodec/vp9.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index ebb89a413c..4a9fed62e0 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -948,7 +948,7 @@ static int decode_frame_header(AVCodecContext *avctx,
                                 break;
                             for (n = 0; n < 3; n++) {
                                 if (vpx_rac_get_prob_branchy(&s->c, 252))
-                                    p[n] = update_prob(&s->c, r[n]);
+                                    r[n] = p[n] = update_prob(&s->c, r[n]);
                                 else
                                     p[n] = r[n];
                             }
@@ -1661,18 +1661,6 @@ static int vp9_decode_frame(AVCodecContext *avctx, AVFrame *frame,
         return ret;
     }
     if (s->s.h.refreshctx && s->s.h.parallelmode) {
-        int j, k, l, m;
-
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 2; j++)
-                for (k = 0; k < 2; k++)
-                    for (l = 0; l < 6; l++)
-                        for (m = 0; m < 6; m++)
-                            memcpy(s->prob_ctx[s->s.h.framectxid].coef[i][j][k][l][m],
-                                   s->prob.coef[i][j][k][l][m], 3);
-            if (s->s.h.txfmmode == i)
-                break;
-        }
         s->prob_ctx[s->s.h.framectxid].p = s->prob.p;
         ff_thread_finish_setup(avctx);
     } else if (!s->s.h.refreshctx) {
-- 
2.32.0 (Apple Git-132)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] libavcodec/vp9:reduce memory copy of prob.coef

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1055 bytes --]

On Mon, Feb 20, 2023 at 06:12:51PM +0800, xufuji456 wrote:
> ---
>  libavcodec/vp9.c | 14 +-------------
>  1 file changed, 1 insertion(+), 13 deletions(-)

This breaks fate
--- ./tests/ref/fate/vp9-00-quantizer-26	2023-02-18 22:17:19.172862988 +0100
+++ tests/data/fate/vp9-00-quantizer-26	2023-02-20 23:07:23.658064323 +0100
@@ -8,4 +8,4 @@
 #sar 0: 1/1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   152064, 4f645e0f354da77b9e2f2a6753c361da
-0,          1,          1,        1,   152064, b7542998ec298273ca662bc9b658d10e
+0,          1,          1,        1,   152064, e30d7da3565aae28d8f3ed0ced8e0ddd
Test vp9-00-quantizer-26 failed. Look at tests/data/fate/vp9-00-quantizer-26.err for details.
tests/Makefile:306: recipe for target 'fate-vp9-00-quantizer-26' failed
make: *** [fate-vp9-00-quantizer-26] Error 1

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".