avfilter/vf_v360: reduce allocations by reusing duplicated remaps

diff --git a/libavfilter/v360.h b/libavfilter/v360.h
index a0eefdec16a21918d95bf69ad0f546f5bfbb8c33..624a0bdda4439d1691e2d186443f855f4d80c633 100644 (file)
--- a/libavfilter/v360.h
+++ b/libavfilter/v360.h
@@ -97,9 +97,11 @@ typedef struct V360Context {
     int planewidth[4], planeheight[4];
     int inplanewidth[4], inplaneheight[4];
     int nb_planes;
+    int nb_allocated;
 
     uint16_t *u[4], *v[4];
     int16_t *ker[4];
+    unsigned map[4];
 
     int (*remap_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
 

diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c
index 5c01427349d54ade2be8128f863d1a57ebe4acf0..a054dd24a6e4387fd84c527f646477149bdb67a8 100644 (file)
--- a/libavfilter/vf_v360.c
+++ b/libavfilter/vf_v360.c
@@ -219,9 +219,10 @@ static int remap##ws##_##bits##bit_slice(AVFilterContext *ctx, void *arg, int jo
         const int slice_end   = (height * (jobnr + 1)) / nb_jobs;                                          \
                                                                                                            \
         for (int y = slice_start; y < slice_end; y++) {                                                    \
-            const uint16_t *u = s->u[plane] + y * width * ws * ws;                                         \
-            const uint16_t *v = s->v[plane] + y * width * ws * ws;                                         \
-            const int16_t *ker = s->ker[plane] + y * width * ws * ws;                                      \
+            const unsigned map = s->map[plane];                                                            \
+            const uint16_t *u = s->u[map] + y * width * ws * ws;                                           \
+            const uint16_t *v = s->v[map] + y * width * ws * ws;                                           \
+            const int16_t *ker = s->ker[map] + y * width * ws * ws;                                        \
                                                                                                            \
             s->remap_line(dst + y * out_linesize, width, src, in_linesize, u, v, ker);                     \
         }                                                                                                  \
@@ -1911,6 +1912,21 @@ static inline void mirror(const float *modifier, float *vec)
     vec[2] *= modifier[2];
 }
 
+static int allocate_plane(V360Context *s, int sizeof_uv, int sizeof_ker, int p)
+{
+    s->u[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_uv);
+    s->v[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_uv);
+    if (!s->u[p] || !s->v[p])
+        return AVERROR(ENOMEM);
+    if (sizeof_ker) {
+        s->ker[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_ker);
+        if (!s->ker[p])
+            return AVERROR(ENOMEM);
+    }
+
+    return 0;
+}
+
 static int config_output(AVFilterLink *outlink)
 {
     AVFilterContext *ctx = outlink->src;
@@ -2103,23 +2119,33 @@ static int config_output(AVFilterLink *outlink)
     s->inplanewidth[0]  = s->inplanewidth[3]  = inlink->w;
     s->nb_planes = av_pix_fmt_count_planes(inlink->format);
 
-    for (p = 0; p < s->nb_planes; p++) {
-        s->u[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_uv);
-        s->v[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_uv);
-        if (!s->u[p] || !s->v[p])
-            return AVERROR(ENOMEM);
-        if (sizeof_ker) {
-            s->ker[p] = av_calloc(s->planewidth[p] * s->planeheight[p], sizeof_ker);
-            if (!s->ker[p])
-                return AVERROR(ENOMEM);
-        }
+    if (desc->log2_chroma_h == desc->log2_chroma_w && desc->log2_chroma_h == 0) {
+        s->nb_allocated = 1;
+        s->map[0] = s->map[1] = s->map[2] = s->map[3] = 0;
+        allocate_plane(s, sizeof_uv, sizeof_ker, 0);
+    } else if (desc->log2_chroma_h == desc->log2_chroma_w) {
+        s->nb_allocated = 2;
+        s->map[0] = 0;
+        s->map[1] = s->map[2] = 1;
+        s->map[3] = 0;
+        allocate_plane(s, sizeof_uv, sizeof_ker, 0);
+        allocate_plane(s, sizeof_uv, sizeof_ker, 1);
+    } else {
+        s->nb_allocated = 3;
+        s->map[0] = 0;
+        s->map[1] = 1;
+        s->map[2] = 2;
+        s->map[3] = 0;
+        allocate_plane(s, sizeof_uv, sizeof_ker, 0);
+        allocate_plane(s, sizeof_uv, sizeof_ker, 1);
+        allocate_plane(s, sizeof_uv, sizeof_ker, 2);
     }
 
     calculate_rotation_matrix(s->yaw, s->pitch, s->roll, rot_mat);
     set_mirror_modifier(s->h_flip, s->v_flip, s->d_flip, mirror_modifier);
 
     // Calculate remap data
-    for (p = 0; p < s->nb_planes; p++) {
+    for (p = 0; p < s->nb_allocated; p++) {
         const int width = s->planewidth[p];
         const int height = s->planeheight[p];
         const int in_width = s->inplanewidth[p];
@@ -2176,7 +2202,7 @@ static av_cold void uninit(AVFilterContext *ctx)
     V360Context *s = ctx->priv;
     int p;
 
-    for (p = 0; p < s->nb_planes; p++) {
+    for (p = 0; p < s->nb_allocated; p++) {
         av_freep(&s->u[p]);
         av_freep(&s->v[p]);
         av_freep(&s->ker[p]);