Commit 76de84e5 authored by norvell's avatar norvell
Browse files

Minor cleanup under (ISM_)NON_DIEGETIC_PAN

parent 4ce7b7fd

lib_enc/ivas_ism_metadata_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -731,9 +731,6 @@ static void encode_radius( 
    *flag_abs_radius = 0; /* differential coding by default */



    if ( *radius_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */

#ifdef ISM_NON_DIEGETIC_PAN

         || last_ism_metadata_flag == 2 /* If last frame had no metadata coded, do not use differential coding */

#endif

         || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */

    )

    {
@@ -845,9 +842,6 @@ static void encode_angle_indices( 
    *flag_abs_angle1 = 0;                      /* differential coding by default */

    if ( angle->angle1_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */

         || last_ism_metadata_flag == 0        /* If last frame had no metadata coded, do not use differential coding */

#ifdef ISM_NON_DIEGETIC_PAN

         || last_ism_metadata_flag == 2 /* If last frame had no metadata coded, do not use differential coding */

#endif

    )

    {

        *flag_abs_angle1 = 1;

lib_rend/lib_rend.c

+3 −2
Original line number Diff line number Diff line
@@ -2640,11 +2640,12 @@ static void clearInputMasa( 
ivas_error IVAS_REND_Open(

    IVAS_REND_HANDLE *phIvasRend,

    const int32_t outputSampleRate,

    const IVAS_REND_AudioConfig outConfig

#ifdef NON_DIEGETIC_PAN

    ,

    const IVAS_REND_AudioConfig outConfig,

    int16_t noDiegeticPan,

    float noDiegeticPanGain

#else

    const IVAS_REND_AudioConfig outConfig

#endif

)

{

lib_rend/lib_rend.h

+5 −4
Original line number Diff line number Diff line
@@ -134,11 +134,12 @@ typedef uint16_t IVAS_REND_InputId; 
ivas_error IVAS_REND_Open(

   IVAS_REND_HANDLE *phIvasRend,                    /* i/o: Pointer to renderer handle                          */

   const int32_t outputSampleRate,                  /* i  : output sampling rate                                */

   const IVAS_REND_AudioConfig outConfig            /* i  : output audio config                                 */

#ifdef NON_DIEGETIC_PAN

    ,

   const IVAS_REND_AudioConfig outConfig,           /* i  : output audio config                                 */

   int16_t noDiegeticPan,                           /* i  : diegetic or not                                     */

   float noDiegeticPanGain                          /* i  : non diegetic pan gain                               */

#else

   const IVAS_REND_AudioConfig outConfig            /* i  : output audio config                                 */

#endif   

);