libhevc: move encoder SEI related code under a macro

Bug: 338446610
Test: ./hevcenc

Change-Id: I76fa9371aac6ef5fca3723425e0010cf1f13db1f

Author: srujan874

Android.bp

@@ -447,6 +447,7 @@ cc_library_static {
     host_supported: true,
     cflags: [
         "-DENABLE_MAIN_REXT_PROFILE",
+        "-DDISABLE_SEI",
         "-fPIC",
         "-O3",
         "-Wall",
@@ -810,6 +811,7 @@ cc_test {
     host_supported: true,
     cflags: [
         "-DARM",
+        "-DDISABLE_SEI",
         "-fPIC",
         "-Wall",
         "-Werror",

common/ihevc_structs.h

@@ -39,6 +39,7 @@
 #define _IHEVC_STRUCTS_H_
 
 
+#ifndef DISABLE_SEI
 /**
  * Buffering Period SEI parameters Info
  */
@@ -519,6 +520,7 @@ typedef struct
     time_code_t s_time_code;
 } sei_params_t;
 
+#endif
 
 /**
  * Sub-layer HRD parameters Info
@@ -952,7 +954,9 @@ typedef struct
     // See IV_FLD_TYPE_T for all field types
     UWORD32 e4_fld_type;
 
+#ifndef DISABLE_SEI
     sei_params_t s_sei_params;
+#endif
 
     WORD32 i4_vui_present;
 

encoder/ihevce_api.h

@@ -76,10 +76,12 @@
 /* Maximum number of processor groups supported */
 #define MAX_NUMBER_PROC_GRPS 4
 
+#ifndef DISABLE_SEI
 /** @brief maximum length of CC User Data in a single frame */
 #define MAX_SEI_PAYLOAD_PER_TLV (0x200)
 
 #define MAX_NUMBER_OF_SEI_PAYLOAD (10)
+#endif
 
 #define IHEVCE_COMMANDS_TAG_MASK (0x0000FFFF)
 
@@ -179,8 +181,10 @@ typedef enum
     IHEVCE_SYNCH_API_END_TAG = 0xFFFF,
     IHEVCE_SYNCH_API_FLUSH_TAG = 0x21,
     IHEVCE_SYNCH_API_FORCE_IDR_TAG = 0x22,
+#ifndef DISABLE_SEI
     IHEVCE_SYNCH_API_REG_KEYFRAME_SEI_TAG = 0x23,
     IHEVCE_SYNCH_API_REG_ALLFRAME_SEI_TAG = 0x24,
+#endif
     IHEVCE_SYNCH_API_SET_RES_TAG = 0x25
 } IHEVCE_SYNCH_API_COMMAND_TAG_T;
 
@@ -192,7 +196,9 @@ typedef enum
     IHEVCE_SYNCH_ERR_NO_PADDING = IHEVCE_SYNCH_ERROR_START + 0x14,
     IHEVCE_SYNCH_ERR_WRONG_LENGTH = IHEVCE_SYNCH_ERROR_START + 0x15,
     IHEVCE_SYNCH_ERR_FREQ_FORCE_IDR_RECEIVED = IHEVCE_SYNCH_ERROR_START + 0x16,
+#ifndef DISABLE_SEI
     IHEVCE_SYNCH_ERR_TOO_MANY_SEI_MSG = IHEVCE_SYNCH_ERROR_START + 0x17,
+#endif
     IHEVCE_SYNCH_ERR_SET_RES_NOT_SUPPORTED = IHEVCE_SYNCH_ERROR_START + 0x18
 } IHEVCE_SYNCH_ERROR_TAG_T;
 
@@ -437,6 +443,7 @@ typedef struct
     /** Enable VUI output  1: enable 0 : disable */
     WORD32 i4_vui_enable;
 
+#ifndef DISABLE_SEI
     /** Enable specific SEI messages in the stream
      *  1: enable 0 : disable
      */
@@ -466,6 +473,7 @@ typedef struct
      *  1: enable 0 : disable
      */
     WORD32 i4_sei_mastering_disp_colour_vol_flags;
+#endif
 
     /**
      * Array to store the display_primaries_x values
@@ -497,6 +505,7 @@ typedef struct
      */
     UWORD32 u4_min_display_mastering_luminance;
 
+#ifndef DISABLE_SEI
     /**
      * Enable Content Level Light Info
      */
@@ -516,6 +525,7 @@ typedef struct
      *  3 : Checksum, 2 : CRC, 1 : MD5, 0 : disable
      */
     WORD32 i4_decoded_pic_hash_sei_flag;
+#endif
 
     /** Enable specific AUD messages in the stream
      *  1: enable 0 : disable

encoder/ihevce_enc_structs.h

@@ -1589,8 +1589,10 @@ typedef struct
     /** Buffer pointer for CTB level information in pre intra pass*/
     ihevce_ed_ctb_l1_t *ps_ed_ctb_l1;
 
+#ifndef DISABLE_SEI
     /** vps parameters activated by current slice  */
     sei_params_t s_sei;
+#endif
 
     /** nal_type for the slice to be encoded  */
     WORD32 i4_slice_nal_type;
@@ -1826,13 +1828,15 @@ typedef struct
     ULWORD64 i8_frame_inter_cost;
 } s_pic_level_acc_info_t;
 
+#ifndef DISABLE_SEI
 typedef struct
 {
     UWORD32 u4_target_bit_rate_sei_entropy;
     UWORD32 u4_buffer_size_sei_entropy;
     UWORD32 u4_dbf_entropy;
 
 } s_pic_level_sei_info_t;
+#endif
 /**
 ******************************************************************************
 *  @brief  ME pass and Main enocde pass shared variables and buffers
@@ -1912,12 +1916,14 @@ typedef struct
 
 } me_enc_rdopt_ctxt_t;
 
+#ifndef DISABLE_SEI
 typedef struct
 {
     UWORD32 u4_payload_type;
     UWORD32 u4_payload_length;
     UWORD8 *pu1_sei_payload;
 } sei_payload_t;
+#endif
 
 typedef struct
 {
@@ -1954,8 +1960,10 @@ typedef struct
     /** vps parameters activated by current slice  */
     vps_t *ps_vps;
 
+#ifndef DISABLE_SEI
     /** vps parameters activated by current slice  */
     sei_params_t s_sei;
+#endif
 
     /* Flag to indicate if AUD NAL is present */
     WORD8 i1_aud_present_flag;
@@ -2019,9 +2027,11 @@ typedef struct
 
     WORD32 i4_is_end_of_idr_gop;
 
+#ifndef DISABLE_SEI
     sei_payload_t as_sei_payload[MAX_NUMBER_OF_SEI_PAYLOAD];
 
     UWORD32 u4_num_sei_payload;
+#endif
     /* Flag used only in mres single output case to flush out one res and start with next */
     WORD32 i4_out_flush_flag;
 

encoder/ihevce_encode_header_sei_vui.c

@@ -595,6 +595,7 @@ WORD32 ihevce_generate_vui(bitstrm_t *ps_bitstrm, sps_t *ps_sps, vui_t s_vui)
     return return_status;
 }
 
+#ifndef DISABLE_SEI
 /**
 ******************************************************************************
 *
@@ -2470,6 +2471,7 @@ WORD32 ihevce_populate_hash_sei(
 
     return IHEVCE_SUCCESS;
 }
+#endif
 
 /**
 ******************************************************************************

encoder/ihevce_encode_header_sei_vui.h

@@ -40,6 +40,7 @@
 /* Function Macros                                                           */
 /*****************************************************************************/
 
+#ifndef DISABLE_SEI
 /**
 ******************************************************************************
  *  @brief   Macro to calculate the CRC for a bit index
@@ -93,17 +94,6 @@ typedef enum
 /* Extern Function Declarations                                              */
 /*****************************************************************************/
 
-WORD32 ihevce_generate_sub_layer_hrd_params(
-    bitstrm_t *ps_bitstrm,
-    sub_lyr_hrd_params_t *ps_sub_lyr_hrd_params,
-    hrd_params_t *ps_hrd_params,
-    WORD32 cpb_cnt_minus1);
-
-WORD32
-    ihevce_generate_hrd_params(bitstrm_t *ps_bitstrm, hrd_params_t *ps_hrd_params, sps_t *ps_sps);
-
-WORD32 ihevce_generate_vui(bitstrm_t *ps_bitstrm, sps_t *ps_sps, vui_t s_vui);
-
 WORD32 ihevce_put_buf_period_sei_params(
     buf_period_sei_params_t *ps_bp_sei, vui_t *ps_vui_params, bitstrm_t *ps_bitstrm);
 
@@ -163,6 +153,18 @@ WORD32 ihevce_populate_hash_sei(
     WORD32 uv_strd,
     WORD32 i4_frame_pos_x,
     WORD32 i4_frame_pos_y);
+#endif
+
+WORD32 ihevce_generate_sub_layer_hrd_params(
+    bitstrm_t *ps_bitstrm,
+    sub_lyr_hrd_params_t *ps_sub_lyr_hrd_params,
+    hrd_params_t *ps_hrd_params,
+    WORD32 cpb_cnt_minus1);
+
+WORD32
+    ihevce_generate_hrd_params(bitstrm_t *ps_bitstrm, hrd_params_t *ps_hrd_params, sps_t *ps_sps);
+
+WORD32 ihevce_generate_vui(bitstrm_t *ps_bitstrm, sps_t *ps_sps, vui_t s_vui);
 
 WORD32 ihevce_populate_vui(
     vui_t *ps_vui,

encoder/ihevce_entropy_cod.c

@@ -282,6 +282,7 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
 
         PROFILE_START(
             &ps_hle_ctxt->profile_entropy[ps_enc_ctxt->i4_resolution_id][i4_bitrate_instance_num]);
+#ifndef DISABLE_SEI
         /* Content Light Level Information */
         {
             ps_curr_inp->s_sei.i1_sei_cll_enable =
@@ -291,6 +292,7 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
             ps_curr_inp->s_sei.s_cll_info_sei_params.u2_sei_avg_cll =
                 ps_enc_ctxt->ps_stat_prms->s_out_strm_prms.u2_sei_avg_cll;
         }
+#endif
         if((NULL != ps_curr_out) && (NULL != ps_curr_inp))
 
         {
@@ -370,6 +372,7 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
 
             if(1 == ps_curr_inp->i4_frm_proc_valid_flag)
             {
+#ifndef DISABLE_SEI
                 /* --- Init of buffering period and pic timing SEI related params ----*/
                 {
                     UWORD32 i4_dbf, i4_buffersize, i4_trgt_bit_rate;
@@ -414,10 +417,12 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
                         ps_curr_inp->ps_sps->ai1_sps_max_num_reorder_pics[0] +
                         ps_curr_inp->i4_display_num - u4_encode_frm_num;
                 }
+#endif
                 /* call the core entropy coding entry point function */
                 entropy_error = ihevce_entropy_encode_frame(
                     pv_entropy_hdl, ps_curr_out, ps_curr_inp, ps_curr_out->i4_bitstream_buf_size);
 
+#ifndef DISABLE_SEI
                 /* ----------------- Derivation of u4_au_cpb_removal_delay_minus1  --------------------------------*/
                 if(ps_curr_inp->s_sei.i1_buf_period_params_present_flag)
                 {
@@ -438,6 +443,7 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
                     u4_au_cpb_removal_delay_minus1 = (u4_au_cpb_removal_delay_minus1 + 1) &
                                                      u4_max_cpb_removal_delay_val;
                 }
+#endif
                 /* Debug prints for entropy error */
                 if(entropy_error)
                 {
@@ -449,13 +455,20 @@ WORD32 ihevce_ent_coding_thrd(void *pv_frm_proc_thrd_ctxt)
                     /* acquire mutex lock for rate control calls */
                     osal_mutex_lock(ps_enc_ctxt->pv_rc_mutex_lock_hdl);
 
+                    UWORD32 removal_delay_minus1;
+#ifndef DISABLE_SEI
+                    removal_delay_minus1 =
+                        ps_curr_inp->s_sei.s_pic_timing_sei_params.u4_au_cpb_removal_delay_minus1;
+#else
+                    removal_delay_minus1 = 0;
+#endif
                     /* get frame rate/bit rate/max buffer size */
                     ihevce_vbv_compliance_frame_level_update(
                         ps_enc_ctxt->s_module_ctxt.apv_rc_ctxt[i4_bitrate_instance_num],
                         (ps_curr_out->i4_bytes_generated << 3),
                         i4_resolution_id,
                         i4_bitrate_instance_num,
-                        ps_curr_inp->s_sei.s_pic_timing_sei_params.u4_au_cpb_removal_delay_minus1);
+                        removal_delay_minus1);
                     /* release mutex lock after rate control calls */
                     osal_mutex_unlock(ps_enc_ctxt->pv_rc_mutex_lock_hdl);
                 }

encoder/ihevce_entropy_interface.c

@@ -322,7 +322,9 @@ WORD32 ihevce_entropy_encode_frame(
     vps_t *ps_vps = ps_curr_inp->ps_vps;
     sps_t *ps_sps = ps_curr_inp->ps_sps;
     pps_t *ps_pps = ps_curr_inp->ps_pps;
+#ifndef DISABLE_SEI
     sei_params_t *ps_sei = &ps_curr_inp->s_sei;
+#endif
     ihevce_tile_params_t *ps_tile_params_base;
     WORD32 out_buf_size = i4_out_buf_size;
 
@@ -355,7 +357,9 @@ WORD32 ihevce_entropy_encode_frame(
     ps_entropy_ctxt->ps_vps = ps_vps;
     ps_entropy_ctxt->ps_sps = ps_sps;
     ps_entropy_ctxt->ps_pps = ps_pps;
+#ifndef DISABLE_SEI
     ps_entropy_ctxt->ps_sei = ps_sei;
+#endif
     ps_entropy_ctxt->ps_slice_hdr = &ps_curr_inp->s_slice_hdr;
     ps_entropy_ctxt->i4_is_cu_cbf_zero = 1;
 
@@ -413,6 +417,7 @@ WORD32 ihevce_entropy_encode_frame(
         ret |= ihevce_generate_pps(ps_bitstrm, ps_entropy_ctxt->ps_pps);
     }
 
+#ifndef DISABLE_SEI
     /* generate sei */
     if(1 == ps_entropy_ctxt->ps_sei->i1_sei_parameters_present_flag)
     {
@@ -435,6 +440,7 @@ WORD32 ihevce_entropy_encode_frame(
                 &ps_curr_inp->as_sei_payload[0]);
         }
     }
+#endif
 
     /*PIC INFO: Populate slice header bits */
     ps_entropy_ctxt->ps_pic_level_info->u8_bits_estimated_slice_header +=
@@ -674,6 +680,7 @@ WORD32 ihevce_entropy_encode_frame(
         }
     }
 
+#ifndef DISABLE_SEI
     /* generate suffix sei */
     if(1 == ps_entropy_ctxt->ps_sei->i1_sei_parameters_present_flag)
     {
@@ -693,6 +700,7 @@ WORD32 ihevce_entropy_encode_frame(
         /* Updating bytes generated */
         ps_curr_out->i4_bytes_generated += ps_bitstrm->u4_strm_buf_offset;
     }
+#endif
 
     /* generate end of sequence nal */
     if((1 == ps_curr_inp->i1_eos_present_flag) && (ps_curr_inp->i4_is_end_of_idr_gop == 1))

encoder/ihevce_entropy_structs.h

@@ -213,8 +213,10 @@ typedef struct entropy_context
     /** pointer to current pps parameters    */
     pps_t *ps_pps;
 
+#ifndef DISABLE_SEI
     /** pointer to current sei parameters    */
     sei_params_t *ps_sei;
+#endif
 
     /** pointer to current slice header parameters    */
     slice_header_t *ps_slice_hdr;