diff mbox series

[FFmpeg-devel,3/5] avcodec/magicyuvenc: Don't modify input frame

Message ID AM7PR03MB666026C87AFD75513D9BD1348F3B9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 095ccc7b335d44fcadfd09e8bcda5defa46d804c
Headers show
Series [FFmpeg-devel,1/5] avcodec/magicyuvenc: Avoid unnecessary av_frame_clone() | expand

Commit Message

Andreas Rheinhardt Feb. 22, 2022, 11:16 p.m. UTC 
It need not be writable at all. Instead, use temporary buffers
for decorrelation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
The prediction functions could be rewritten to allow src and dst
to alias each other; yet LLVidEncDSPContext.diff_bytes has the
requirement that dst has an alignment of 16.

 libavcodec/magicyuvenc.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

Comments

Paul B Mahol Feb. 23, 2022, 8:54 a.m. UTC | #1 
lgtm
diff mbox series

Patch

diff --git a/libavcodec/magicyuvenc.c b/libavcodec/magicyuvenc.c
index ffb0be1d14..5a37a49d63 100644
--- a/libavcodec/magicyuvenc.c
+++ b/libavcodec/magicyuvenc.c
@@ -67,6 +67,7 @@  typedef struct MagicYUVContext {
     uint8_t             *slices[4];
     unsigned             slice_pos[4];
     unsigned             tables_size;
+    uint8_t             *decorrelate_buf[2];
     HuffEntry            he[4][256];
     LLVidEncDSPContext   llvidencdsp;
     void (*predict)(struct MagicYUVContext *s, const uint8_t *src, uint8_t *dst,
@@ -190,6 +191,12 @@  static av_cold int magy_encode_init(AVCodecContext *avctx)
         s->format = 0x6b;
         break;
     }
+    if (s->correlate) {
+        s->decorrelate_buf[0] = av_calloc(2U * avctx->height, FFALIGN(avctx->width, 16));
+        if (!s->decorrelate_buf[0])
+            return AVERROR(ENOMEM);
+        s->decorrelate_buf[1] = s->decorrelate_buf[0] + avctx->height * FFALIGN(avctx->width, 16);
+    }
 
     ff_llvidencdsp_init(&s->llvidencdsp);
 
@@ -452,22 +459,26 @@  static int magy_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     if (s->correlate) {
-        uint8_t *const data[4] = { frame->data[1], frame->data[0],
-                                   frame->data[2], frame->data[3] };
-        const int linesize[4]  = { frame->linesize[1], frame->linesize[0],
-                                   frame->linesize[2], frame->linesize[3] };
-        uint8_t *r, *g, *b;
+        uint8_t *r, *g, *b, *decorrelated[2] = { s->decorrelate_buf[0],
+                                                 s->decorrelate_buf[1] };
+        const int decorrelate_linesize = FFALIGN(width, 16);
+        const uint8_t *const data[4] = { decorrelated[0], frame->data[0],
+                                         decorrelated[1], frame->data[3] };
+        const int linesize[4]  = { decorrelate_linesize, frame->linesize[0],
+                                   decorrelate_linesize, frame->linesize[3] };
 
         g = frame->data[0];
         b = frame->data[1];
         r = frame->data[2];
 
         for (i = 0; i < height; i++) {
-            s->llvidencdsp.diff_bytes(b, b, g, width);
-            s->llvidencdsp.diff_bytes(r, r, g, width);
+            s->llvidencdsp.diff_bytes(decorrelated[0], b, g, width);
+            s->llvidencdsp.diff_bytes(decorrelated[1], r, g, width);
             g += frame->linesize[0];
             b += frame->linesize[1];
             r += frame->linesize[2];
+            decorrelated[0] += decorrelate_linesize;
+            decorrelated[1] += decorrelate_linesize;
         }
 
         for (i = 0; i < s->planes; i++) {
@@ -531,6 +542,7 @@  static av_cold int magy_encode_close(AVCodecContext *avctx)
 
     for (i = 0; i < s->planes; i++)
         av_freep(&s->slices[i]);
+    av_freep(&s->decorrelate_buf);
 
     return 0;
 }