Commit 81d42039 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix formatting

parent 55a0a89d

apps/encoder.c

+5 −3
Original line number Diff line number Diff line
@@ -560,7 +560,9 @@ int main( 
#ifdef SBA_AND_OBJECTS

                                   || arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM

#endif

                                  ) ? arg.inputFormatConfig.ism.numObjects : 0;

                                   )

                                     ? arg.inputFormatConfig.ism.numObjects

                                     : 0;

#else

    const int16_t numIsmInputs = arg.inputFormat == IVAS_ENC_INPUT_ISM ? arg.inputFormatConfig.ism.numObjects : 0;

#endif

lib_dec/ivas_init_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -1447,7 +1447,6 @@ ivas_error ivas_init_decoder( 
            return error;

        }

#endif



    }

#endif

#ifdef MASA_AND_OBJECTS

lib_rend/ivas_dirac_rend.c

+4 −6
Original line number Diff line number Diff line
@@ -316,9 +316,7 @@ ivas_error ivas_spat_hSpatParamRendCom_config( 
#ifdef MASA_AND_OBJECTS

        if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT

#ifdef OSBA_DISC_OBJ_MCT

            || ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) 

                 && hodirac_flag 

               ) 

             || ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && hodirac_flag )

#else

             || ( ivas_format == SBA_FORMAT && hodirac_flag )

#endif

lib_dec/ivas_ism_metadata_dec.c

+9 −9

File changed.

Contains only whitespace changes.

lib_dec/ivas_mct_dec.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/ivas_ism_enc.c

+3 −3

File changed.

Contains only whitespace changes.

lib_dec/ivas_dirac_dec.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/ivas_omasa_dec.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/ivas_enc.c

+3 −3

File changed.

Contains only whitespace changes.

lib_enc/ivas_ism_metadata_enc.c

+16 −16

File changed.

Contains only whitespace changes.

lib_dec/ivas_output_config.c

+4 −4

File changed.

Contains only whitespace changes.

lib_dec/ivas_sba_dirac_stereo_dec.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/lib_enc.c

+3 −3

File changed.

Contains only whitespace changes.

lib_rend/ivas_objectRenderer.c

+6 −6

File changed.

Contains only whitespace changes.

lib_dec/ivas_osba_dec.c

+5 −5

File changed.

Contains only whitespace changes.

lib_dec/lib_dec.c

+6 −6

File changed.

Contains only whitespace changes.

apps/decoder.c

+8 −8

File changed.

Contains only whitespace changes.

lib_dec/ivas_dec.c

+4 −4

File changed.

Contains only whitespace changes.