Commit 9bca5e35 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Try different approach to satisfy clang format.

parent 889e5146
Loading
Loading
Loading
Loading
Loading
+14 −11
Original line number Diff line number Diff line
@@ -1665,18 +1665,10 @@ ivas_error ivas_init_decoder_fx(
        }
    }

// clang-format off
#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
    /* This section is correctly formatted but clang-format in CI messes this up. Can probably be removed with accepted switches */

    /*--------------------------------------------------------------------------*
     * Allocate and initialize HRTF Statistics handle, get default reverb values
     *--------------------------------------------------------------------------*/
#else
    /*--------------------------------------------------------------------*
     * Allocate and initialize HRTF Statistics handle
     *--------------------------------------------------------------------*/
#endif

    IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
    {
@@ -1686,7 +1678,6 @@ ivas_error ivas_init_decoder_fx(
            return error;
        }

#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
        /* Get default reverb values based on format, if custom values were not given */
        IF( EQ_16(st_ivas->hDecoderConfig->Opt_RendConfigCustom, 0) )
        {
@@ -1744,9 +1735,21 @@ ivas_error ivas_init_decoder_fx(
                return error;
            }
        }
#endif
    }
// clang-format on
#else
    /*--------------------------------------------------------------------*
     * Allocate and initialize HRTF Statistics handle
     *--------------------------------------------------------------------*/

    IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
    {
        /* Init HRTF statistics */
        IF( NE_32( ( error = ivas_HRTF_statistics_init_fx( &st_ivas->hHrtfStatistics, output_Fs ) ), IVAS_ERR_OK ) )
        {
            return error;
        }
    }
#endif

    /*-----------------------------------------------------------------*
     * Allocate and initialize SCE/CPE and other handles