vaapi: fix 'ISO C90 forbids mixed declarations and code' compiler warnings

Declare variables at the beginning of a code block, which
is how it's done in GStreamer.

https://bugzilla.gnome.org/show_bug.cgi?id=759192

4 files changed, 28 insertions, 16 deletions

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index bd8f32a1..ffe9e5fb 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -3626,8 +3626,6 @@ exec_ref_pic_marking_adaptive(
 {
     guint i;
 
-    GST_DEBUG("reference picture marking process (adaptive memory control)");
-
     typedef void (*exec_ref_pic_marking_adaptive_mmco_func)(
         GstVaapiDecoderH264  *decoder,
         GstVaapiPictureH264  *picture,
@@ -3644,6 +3642,8 @@ exec_ref_pic_marking_adaptive(
         exec_ref_pic_marking_adaptive_mmco_6,
     };
 
+    GST_DEBUG("reference picture marking process (adaptive memory control)");
+
     for (i = 0; i < dec_ref_pic_marking->n_ref_pic_marking; i++) {
         GstH264RefPicMarking * const ref_pic_marking =
             &dec_ref_pic_marking->ref_pic_marking[i];
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
index a4e28257..3afb765e 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
@@ -610,10 +610,12 @@ decode_picture(GstVaapiDecoderMpeg4 *decoder, const guint8 *buf, guint buf_size)
 
     if (priv->is_svh) {
         guint temp_ref = priv->svh_hdr.temporal_reference;
+        guint delta_ref;
+
         if (temp_ref < priv->prev_t_ref) {
             temp_ref += 256;
         }
-        guint delta_ref = temp_ref - priv->prev_t_ref;
+        delta_ref = temp_ref - priv->prev_t_ref;
 
         pts = priv->sync_time;
         // see temporal_reference definition in spec, 30000/1001Hz
@@ -707,6 +709,8 @@ fill_picture(GstVaapiDecoderMpeg4 *decoder, GstVaapiPicture *picture)
         pic_param->num_macroblocks_in_gob                       = priv->svh_hdr.num_macroblocks_in_gob;
     }
     else {
+        int i;
+
         // VOL parameters
         pic_param->vol_fields.bits.short_video_header           = 0; 
         pic_param->vol_fields.bits.chroma_format                = priv->vol_hdr.chroma_format;
@@ -720,7 +724,7 @@ fill_picture(GstVaapiDecoderMpeg4 *decoder, GstVaapiPicture *picture)
         pic_param->vol_fields.bits.reversible_vlc               = priv->vol_hdr.reversible_vlc;
         pic_param->vol_fields.bits.resync_marker_disable        = priv->vol_hdr.resync_marker_disable;
         pic_param->no_of_sprite_warping_points                  = priv->vol_hdr.no_of_sprite_warping_points;
-        int i =0;
+
         for (i=0; i<3 && i<priv->vol_hdr.no_of_sprite_warping_points ; i++) {
             pic_param->sprite_trajectory_du[i]                  = priv->sprite_trajectory.vop_ref_points[i];
             pic_param->sprite_trajectory_dv[i]                  = priv->sprite_trajectory.sprite_ref_points[i];
@@ -839,6 +843,10 @@ decode_packet(GstVaapiDecoderMpeg4 *decoder, GstMpeg4Packet packet)
         status = decode_gop(decoder, packet.data + packet.offset, packet.size);
     }
     else if (tos->type == GST_MPEG4_VIDEO_OBJ_PLANE) {
+        GstMpeg4Packet video_packet;
+        const guint8 *_data;
+        gint  _data_size;
+
         status = decode_picture(decoder, packet.data + packet.offset, packet.size);
         if (status != GST_VAAPI_DECODER_STATUS_SUCCESS)
             return status;
@@ -852,9 +860,8 @@ decode_packet(GstVaapiDecoderMpeg4 *decoder, GstMpeg4Packet packet)
          * while MB doesn't start from byte boundary -- it is what 'macroblock_offset' 
          * in slice refer to
          */
-        const guint8 *_data = packet.data + packet.offset + priv->vop_hdr.size/8; 
-        gint  _data_size = packet.size - (priv->vop_hdr.size/8); 
-        GstMpeg4Packet video_packet;
+        _data = packet.data + packet.offset + priv->vop_hdr.size/8;
+        _data_size = packet.size - (priv->vop_hdr.size/8);
         
         if (priv->vol_hdr.resync_marker_disable) {
             status = decode_slice(decoder, _data, _data_size, FALSE);
@@ -862,11 +869,12 @@ decode_packet(GstVaapiDecoderMpeg4 *decoder, GstMpeg4Packet packet)
                 return status;
         }
         else {
+            GstMpeg4ParseResult ret = GST_MPEG4_PARSER_OK;
+            gboolean first_slice = TRUE;
+
             // next start_code is required to determine the end of last slice
             _data_size += 4;
-            GstMpeg4ParseResult ret = GST_MPEG4_PARSER_OK;
 
-            gboolean first_slice = TRUE;
             while (_data_size > 0) {
                 // we can skip user data here
                 ret = gst_mpeg4_parse(&video_packet, TRUE, &priv->vop_hdr, _data, 0,  _data_size);
@@ -955,6 +963,8 @@ gst_vaapi_decoder_mpeg4_decode_codec_data(GstVaapiDecoder *base_decoder,
     GstVaapiDecoderMpeg4 * const decoder =
         GST_VAAPI_DECODER_MPEG4_CAST(base_decoder);
     GstVaapiDecoderStatus status = GST_VAAPI_DECODER_STATUS_SUCCESS;
+    GstMpeg4ParseResult result = GST_MPEG4_PARSER_OK;
+    GstMpeg4Packet packet;
     guchar *buf;
     guint pos, buf_size;
 
@@ -968,8 +978,6 @@ gst_vaapi_decoder_mpeg4_decode_codec_data(GstVaapiDecoder *base_decoder,
     buf[buf_size-1] = 0xb2;
 
     pos = 0;
-    GstMpeg4Packet packet;
-    GstMpeg4ParseResult result = GST_MPEG4_PARSER_OK;
 
     while (result == GST_MPEG4_PARSER_OK && pos < buf_size) {
         result = gst_mpeg4_parse(&packet, FALSE, NULL, buf, pos, buf_size);
diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
index 758af7f2..3ad9378b 100644
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
@@ -591,11 +591,12 @@ bs_write_subset_sps (GstBitWriter * bs,
 
     for (i = 1; i <= num_views_minus1; i++) {
       guint32 num_anchor_refs_l0 = 0;
+      guint32 num_anchor_refs_l1 = 0;
+
       WRITE_UE (bs, num_anchor_refs_l0);
       for (j = 0; j < num_anchor_refs_l0; j++)
         WRITE_UE (bs, 0);
 
-      guint32 num_anchor_refs_l1 = 0;
       WRITE_UE (bs, num_anchor_refs_l1);
       for (j = 0; j < num_anchor_refs_l1; j++)
         WRITE_UE (bs, 0);
@@ -603,11 +604,12 @@ bs_write_subset_sps (GstBitWriter * bs,
 
     for (i = 1; i <= num_views_minus1; i++) {
       guint32 num_non_anchor_refs_l0 = 0;
+      guint32 num_non_anchor_refs_l1 = 0;
+
       WRITE_UE (bs, num_non_anchor_refs_l0);
       for (j = 0; j < num_non_anchor_refs_l0; j++)
         WRITE_UE (bs, 0);
 
-      guint32 num_non_anchor_refs_l1 = 0;
       WRITE_UE (bs, num_non_anchor_refs_l1);
       for (j = 0; j < num_non_anchor_refs_l1; j++)
         WRITE_UE (bs, 0);
@@ -2452,13 +2454,14 @@ reset_properties (GstVaapiEncoderH264 * encoder)
 
   for (i = 0; i < encoder->num_views; i++) {
     GstVaapiH264ViewRefPool *const ref_pool = &encoder->ref_pools[i];
+    GstVaapiH264ViewReorderPool *const reorder_pool =
+        &encoder->reorder_pools[i];
+
     ref_pool->max_reflist0_count = 1;
     ref_pool->max_reflist1_count = encoder->num_bframes > 0;
     ref_pool->max_ref_frames = ref_pool->max_reflist0_count
         + ref_pool->max_reflist1_count;
 
-    GstVaapiH264ViewReorderPool *const reorder_pool =
-        &encoder->reorder_pools[i];
     reorder_pool->frame_index = 0;
   }
 }
diff --git a/gst-libs/gst/vaapi/gstvaapifilter.c b/gst-libs/gst/vaapi/gstvaapifilter.c
index 343e2c7e..802e12ce 100644
--- a/gst-libs/gst/vaapi/gstvaapifilter.c
+++ b/gst-libs/gst/vaapi/gstvaapifilter.c
@@ -596,11 +596,12 @@ get_operations_default (void)
   ensure_properties ();
 
   for (i = 0; i < N_PROPERTIES; i++) {
+    GstVaapiFilterOpData *op_data;
     GParamSpec *const pspec = g_properties[i];
     if (!pspec)
       continue;
 
-    GstVaapiFilterOpData *const op_data = op_data_new (i, pspec);
+    op_data = op_data_new (i, pspec);
     if (!op_data)
       goto error;
     g_ptr_array_add (ops, op_data);