Commit 90802997 authored by vaclav's avatar vaclav
Browse files

formatting + comments

parent fd999d98

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -2590,7 +2590,7 @@ void ivas_mct_core_enc( 
    const SBA_MODE sba_mode                                     /* i  : SBA mode                            */

#ifdef FIX_I1_113

    ,

    const int16_t sba_order

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order               */

#endif

);

lib_dec/ivas_dirac_dec.c

+2 −6
Original line number Diff line number Diff line
@@ -1985,9 +1985,7 @@ void ivas_dirac_dec( 
                                                reference_power, slot_idx, nchan_transport,

                                                hDirAC->num_outputs_diff,

                                                hDirAC->num_freq_bands,

                                                p_Rmat



                    );

                                                p_Rmat );

                }

                else

                {
@@ -1997,9 +1995,7 @@ void ivas_dirac_dec( 
                                                reference_power, slot_idx, nchan_transport,

                                                hDirAC->num_outputs_diff,

                                                hDirAC->num_freq_bands,

                                                0



                    );

                                                0 );

                }

            }

            else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO )

lib_dec/ivas_sba_dec.c

+5 −4
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ int16_t ivas_sba_remapTCs( 
        nchan_remapped++;

        if ( st_ivas->sba_mode != SBA_MODE_SPAR )

        {

            assert( ( ( st_ivas->nchan_transport == 3 ) || ( st_ivas->nchan_transport == 5 ) || ( st_ivas->nchan_transport == 7 ) ) && "Number of channels must be odd for sba planar!" );

            assert( ( ( st_ivas->nchan_transport == 3 ) || ( st_ivas->nchan_transport == 5 ) || ( st_ivas->nchan_transport == 7 ) ) && "Number of channels must be odd for SBA planar!" );

        }



        if ( nchan_remapped == 4 )
@@ -275,6 +275,7 @@ int16_t ivas_sba_remapTCs( 
    {

        ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_order, st_ivas->sba_planar, output_frame );

    }



    return ( nchan_remapped );

}
@@ -721,7 +722,7 @@ ivas_error ivas_sba_dec_reconfigure( 


        if ( nchan_transport > nchan_transport_old )

        {

            /* create additional hp20 mems */

            /* create additional hp20 memories */

            float **old_mem_hp20_out;

            uint16_t n_old;
@@ -763,7 +764,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else if ( nchan_transport < nchan_transport_old )

        {

            /* remove superfluous hp20 mems */

            /* remove superfluous hp20 memories */

            float **old_mem_hp20_out;



            if ( st_ivas->sba_dirac_stereo_flag )
@@ -892,7 +893,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

    }



    /* special case, if the decoder goes from 1TC DTX to 2TC active frame (in case the bitstream started with an SBA SID frame), allocate DTX mems */

    /* special case, if the decoder goes from 1TC DTX to 2TC active frame (in case the bitstream started with an SBA SID frame), allocate DTX memories */

    if ( last_ivas_total_brate <= IVAS_SID_4k4 && st_ivas->nCPE >= 1 )

    {

        if ( ( error = initMdctStereoDtxData( st_ivas->hCPE[0] ) ) != IVAS_ERR_OK )

lib_dec/ivas_spar_decoder.c

+1 −3
Original line number Diff line number Diff line
@@ -1222,9 +1222,7 @@ void ivas_spar_dec_upmixer( 
                        &cldfb_in_ts_im[out_ch][ts],

                        &output[out_ch][( ts + i_sf * MAX_PARAM_SPATIAL_SUBFRAMES ) * num_cldfb_bands],

                        num_cldfb_bands,

                        st_ivas->cldfbSynDec[out_ch]



                    );

                        st_ivas->cldfbSynDec[out_ch] );

                }

            }

#ifdef DEBUG_SBA_AUDIO_DUMP

lib_enc/ivas_mct_core_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ void ivas_mct_core_enc( 
    const SBA_MODE sba_mode              /* i  : SBA mode                        */

#ifdef FIX_I1_113

    ,

    const int16_t sba_order

    const int16_t sba_order              /* i  : Ambisonic (SBA) order           */

#endif

)

{