From a0ba72ed501f290199870784bcffc96366c09a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Fri, 9 Oct 2020 12:27:12 +0200
Subject: [PATCH] va: h264dec: set video alignment definition earlier

This patch renames need_cropping variable to need_videoalign which is clearer
with its function. And now GstVideoAlignment is part of GstVaH264Dec structure,
so it can be set earlier.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1673>
---
 sys/va/gstvah264dec.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys/va/gstvah264dec.c b/sys/va/gstvah264dec.c
index 102d716fb3..640917d0e4 100644
--- a/sys/va/gstvah264dec.c
+++ b/sys/va/gstvah264dec.c
@@ -102,8 +102,10 @@ struct _GstVaH264Dec
   guint rt_format;
   gint dpb_size;
 
+  gboolean need_videoalign;
+  GstVideoAlignment valign;
+
   gboolean need_negotiation;
-  gboolean need_cropping;
   gboolean has_videometa;
   gboolean copy_frames;
 };
@@ -734,8 +736,16 @@ gst_va_h264_dec_new_sequence (GstH264Decoder * decoder, const GstH264SPS * sps,
         self->display_height);
   }
 
-  self->need_cropping = self->display_width < self->coded_width
+  self->need_videoalign = self->display_width < self->coded_width
       || self->display_height < self->coded_height;
+  if (self->need_videoalign) {
+    /* *INDENT-OFF* */
+    self->valign = (GstVideoAlignment) {
+      .padding_bottom = self->coded_height - self->display_height,
+      .padding_left = self->coded_width - self->display_width,
+    };
+    /* *INDENT-ON* */
+  }
 
   if (negotiation_needed) {
     self->need_negotiation = TRUE;
@@ -1132,7 +1142,7 @@ gst_va_h264_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
         has_videoalignment = gst_buffer_pool_has_option (pool,
             GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
         if (!self->has_videometa || (!has_videoalignment
-                && self->need_cropping)) {
+                && self->need_videoalign)) {
           GST_DEBUG_OBJECT (self,
               "keeping other pool for copy %" GST_PTR_FORMAT, pool);
           gst_object_replace ((GstObject **) & self->other_pool,
@@ -1185,14 +1195,10 @@ gst_va_h264_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
     gst_buffer_pool_config_add_option (config,
         GST_BUFFER_POOL_OPTION_VIDEO_META);
 
-    if (self->need_cropping) {
-      GstVideoAlignment video_align = {
-        .padding_bottom = self->coded_height - self->display_height,
-        .padding_left = self->coded_width - self->display_width,
-      };
+    if (self->need_videoalign) {
       gst_buffer_pool_config_add_option (config,
           GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT);
-      gst_buffer_pool_config_set_video_alignment (config, &video_align);
+      gst_buffer_pool_config_set_video_alignment (config, &self->valign);
     }
 
     gst_buffer_pool_config_set_va_allocation_params (config,