Updates to Android.bp and some formatting fixes

- Only libavcdec is marked as available to apex modules instead
  of marking all decoder libraries to be available to apex modules.
- some formatting changes for consistency with neighboring lines.

Test: Builds

5 files changed, 20 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index c53786d..f80617d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -158,12 +158,6 @@ cc_defaults {
         },
         blocklist: "libavc_blocklist.txt",
     },
-
-    apex_available: [
-        "//apex_available:platform", //due to libstagefright_soft_avcenc
-        "com.android.media.swcodec",
-    ],
-    min_sdk_version: "29",
 }
 
 cc_defaults {
@@ -658,6 +652,12 @@ cc_library_static {
             ],
         },
     },
+
+    apex_available: [
+        "//apex_available:platform", //due to libstagefright_soft_avcenc
+        "com.android.media.swcodec",
+    ],
+    min_sdk_version: "29",
 }
 
 cc_library_static {
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c
index 6250887..6a85a0a 100644
--- a/decoder/ih264d_api.c
+++ b/decoder/ih264d_api.c
@@ -490,10 +490,10 @@ static IV_API_CALL_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle,
                                  ps_ip->s_ivd_video_decode_ip_t.u4_num_Bytes);
             ps_op->s_ivd_video_decode_op_t.u4_error_code = 0;
 
-            if(ps_ip->s_ivd_video_decode_ip_t.u4_size
-                            != sizeof(ih264d_video_decode_ip_t) &&
-                            ps_ip->s_ivd_video_decode_ip_t.u4_size != sizeof(ivd_video_decode_ip_t) &&
-                            ps_ip->s_ivd_video_decode_ip_t.u4_size != offsetof(ivd_video_decode_ip_t, s_out_buffer))
+            if(ps_ip->s_ivd_video_decode_ip_t.u4_size != sizeof(ih264d_video_decode_ip_t) &&
+               ps_ip->s_ivd_video_decode_ip_t.u4_size != sizeof(ivd_video_decode_ip_t) &&
+               ps_ip->s_ivd_video_decode_ip_t.u4_size !=
+                   offsetof(ivd_video_decode_ip_t, s_out_buffer))
             {
                 ps_op->s_ivd_video_decode_op_t.u4_error_code |= 1
                                 << IVD_UNSUPPORTEDPARAM;
@@ -502,10 +502,10 @@ static IV_API_CALL_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle,
                 return (IV_FAIL);
             }
 
-            if(ps_op->s_ivd_video_decode_op_t.u4_size
-                            != sizeof(ih264d_video_decode_op_t) &&
-                            ps_op->s_ivd_video_decode_op_t.u4_size != sizeof(ivd_video_decode_op_t) &&
-                            ps_op->s_ivd_video_decode_op_t.u4_size != offsetof(ivd_video_decode_op_t, u4_output_present))
+            if(ps_op->s_ivd_video_decode_op_t.u4_size != sizeof(ih264d_video_decode_op_t) &&
+               ps_op->s_ivd_video_decode_op_t.u4_size != sizeof(ivd_video_decode_op_t) &&
+               ps_op->s_ivd_video_decode_op_t.u4_size !=
+                   offsetof(ivd_video_decode_op_t, u4_output_present))
             {
                 ps_op->s_ivd_video_decode_op_t.u4_error_code |= 1
                                 << IVD_UNSUPPORTEDPARAM;
diff --git a/decoder/ivd.h b/decoder/ivd.h
index 69d74ac..1b4b86e 100644
--- a/decoder/ivd.h
+++ b/decoder/ivd.h
@@ -399,9 +399,9 @@ typedef struct {
 
     UWORD8                                         u1_sei_ccv_params_present_flag;
 
-    UWORD8 u1_sei_sii_params_present_flag;
+    UWORD8                                         u1_sei_sii_params_present_flag;
 
-    UWORD8 u1_sei_fgc_params_present_flag;
+    UWORD8                                         u1_sei_fgc_params_present_flag;
 
 }ivd_sei_decode_op_t;
 
diff --git a/encoder/ih264e_structs.h b/encoder/ih264e_structs.h
index b279d85..4c3f63f 100644
--- a/encoder/ih264e_structs.h
+++ b/encoder/ih264e_structs.h
@@ -313,10 +313,10 @@ typedef struct
     sei_ccv_params_t                        s_sei_ccv;
 
     /** SEI SII params flag                                              */
-    UWORD8 u1_sei_sii_params_present_flag;
+    UWORD8                                  u1_sei_sii_params_present_flag;
 
     /** SEI SII params info                                              */
-    sei_sii_params_t s_sei_sii;
+    sei_sii_params_t                        s_sei_sii;
 
 }inp_buf_t;
 
diff --git a/fuzzer/avc_enc_fuzzer.cpp b/fuzzer/avc_enc_fuzzer.cpp
index f9d5372..7c5e2cf 100644
--- a/fuzzer/avc_enc_fuzzer.cpp
+++ b/fuzzer/avc_enc_fuzzer.cpp
@@ -843,8 +843,8 @@ void Codec::setSeiSiiParams() {
         sSeiSiiParamsIp.u1_fixed_shutter_interval_within_cvs_flag = 0;
         sSeiSiiParamsIp.u4_sii_num_units_in_shutter_interval = 480000;
         sSeiSiiParamsIp.u1_sii_max_sub_layers_minus1 = 7;
-        for(int i4_count = 0; i4_count <= sSeiSiiParamsIp.u1_sii_max_sub_layers_minus1; ++i4_count) {
-            sSeiSiiParamsIp.au4_sub_layer_num_units_in_shutter_interval[i4_count] = 480000;
+        for(int count = 0; count <= sSeiSiiParamsIp.u1_sii_max_sub_layers_minus1; ++count) {
+            sSeiSiiParamsIp.au4_sub_layer_num_units_in_shutter_interval[count] = 480000;
         }
         sSeiSiiParamsIp.au4_sub_layer_num_units_in_shutter_interval
             [sSeiSiiParamsIp.u1_sii_max_sub_layers_minus1] = 240000;