Commit 4ca8e1a5 authored by multrus's avatar multrus
Browse files

Merge branch 'cleanup_20220811' into 'main' 

Cleanup 20220811

See merge request !79
parents 2fb14e0d 446d6db0

apps/encoder.c

100644 → 100755
+1 −1

File changed.File mode changed from 100644 to 100755.

Contains only whitespace changes.

lib_com/bitstream.c

100644 → 100755
+4 −16
Original line number Diff line number Diff line
@@ -1975,22 +1975,10 @@ ivas_error preview_indices( 
        }

        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

#ifndef ORDER_BITS_ADDITION

            if ( ( st_ivas->sba_mode != SBA_MODE_SPAR ) || ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && ( total_brate >= IVAS_256k ) ) )

            {

#endif

            /* Read SBA planar flag and SBA order */

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

#ifndef ORDER_BITS_ADDITION

            }

            else

            {

                st_ivas->sba_planar = 0;

                st_ivas->sba_order = 1;

            }

#endif

            ivas_sba_config( total_brate, st_ivas->sba_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ), st_ivas->sba_mode );

        }

    }

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -1298,11 +1298,7 @@ typedef enum 
#define IVAS_LFE_NUM_COEFFS_IN_SUBGRP           2

#define IVAS_LFE_MAX_NUM_DCT_PASS_BINS          8

#define IVAS_LFE_MAX_NUM_DCT_COEFFS             (IVAS_LFE_MAX_NUM_DCT_PASS_BINS * IVAS_LFE_NUM_COEFFS_IN_SUBGRP)

#ifdef SBA_CLEANING

#define IVAS_LFE_FADE_NS                        8000000L    /* 8.0 ms */

#else

#define IVAS_LFE_FADE_LEN_SEC_FLOAT             ((float)0.008)

#endif

#define IVAS_MAX_NUM_QUANT_STRATS               2

#define IVAS_MAX_NUM_DCT_COEF_GROUPS            4

#define IVAS_LFE_SHIFT_BITS                     5

lib_com/ivas_entropy_coder_common.c

100644 → 100755
+4 −4

File changed.File mode changed from 100644 to 100755.

Contains only whitespace changes.

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -2588,10 +2588,6 @@ void ivas_mct_core_enc( 
    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                  */

    const int16_t switch_bw,                                    /* i  : flag bandwidth switch occurance     */

    const int16_t lfe_bits                                      /* i  : bits spent for LFE                  */

#ifndef ORDER_BITS_ADDITION

    ,

    const SBA_MODE sba_mode                                     /* i  : SBA mode                            */

#endif

#ifdef FIX_I1_113

    ,

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