diff mbox series

[FFmpeg-devel,v2,22/22] avfilter/vf_framepack: Use dedicated pointer for access

Message ID AS8P250MB0744B98C385F86BCB089EE668FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit da784b81a671677342c54e32add39d7d9ce15563
Headers show
Series [FFmpeg-devel,v2,01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue | expand

Commit Message

Andreas Rheinhardt Sept. 7, 2023, 1:05 a.m. UTC 
Improves readability.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/vf_framepack.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c
index cbfcf1e036..3b915ddddf 100644
--- a/libavfilter/vf_framepack.c
+++ b/libavfilter/vf_framepack.c
@@ -233,19 +233,20 @@  static void horizontal_frame_pack(AVFilterLink *outlink,
         }
     } else {
         for (i = 0; i < 2; i++) {
+            const AVFrame *const input_view = s->input_views[i];
             const int psize = 1 + (s->depth > 8);
             uint8_t *dst[4];
-            int sub_w = psize * s->input_views[i]->width >> s->pix_desc->log2_chroma_w;
+            int sub_w = psize * input_view->width >> s->pix_desc->log2_chroma_w;
 
-            dst[0] = out->data[0] + i * s->input_views[i]->width * psize;
+            dst[0] = out->data[0] + i * input_view->width * psize;
             dst[1] = out->data[1] + i * sub_w;
             dst[2] = out->data[2] + i * sub_w;
 
             av_image_copy2(dst, out->linesize,
-                           s->input_views[i]->data, s->input_views[i]->linesize,
-                           s->input_views[i]->format,
-                           s->input_views[i]->width,
-                           s->input_views[i]->height);
+                           input_view->data, input_view->linesize,
+                           input_view->format,
+                           input_view->width,
+                           input_view->height);
         }
     }
 }
@@ -259,12 +260,13 @@  static void vertical_frame_pack(AVFilterLink *outlink,
     int i;
 
     for (i = 0; i < 2; i++) {
+        const AVFrame *const input_view = s->input_views[i];
         uint8_t *dst[4];
         int linesizes[4];
-        int sub_h = s->input_views[i]->height >> s->pix_desc->log2_chroma_h;
+        int sub_h = input_view->height >> s->pix_desc->log2_chroma_h;
 
         dst[0] = out->data[0] + i * out->linesize[0] *
-                 (interleaved + s->input_views[i]->height * (1 - interleaved));
+                 (interleaved + input_view->height * (1 - interleaved));
         dst[1] = out->data[1] + i * out->linesize[1] *
                  (interleaved + sub_h * (1 - interleaved));
         dst[2] = out->data[2] + i * out->linesize[2] *
@@ -278,10 +280,10 @@  static void vertical_frame_pack(AVFilterLink *outlink,
                        interleaved * out->linesize[2];
 
         av_image_copy2(dst, linesizes,
-                       s->input_views[i]->data, s->input_views[i]->linesize,
-                       s->input_views[i]->format,
-                       s->input_views[i]->width,
-                       s->input_views[i]->height);
+                       input_view->data, input_view->linesize,
+                       input_view->format,
+                       input_view->width,
+                       input_view->height);
     }
 }