Commit 50e276df authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix compiler warnings

parent 2f6a3c88

lib_dec/ivas_dirac_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -2425,7 +2425,6 @@ void ivas_dirac_dec_render_sf( 
                float *g1, g2;

                int16_t num_objects, nchan_out_woLFE, lfe_index;

                int16_t az1, el1;

                int16_t tc_offset;

                int16_t n_slots_to_render;

                int16_t n_samples_to_render;

                int16_t interp_offset;
@@ -2434,7 +2433,6 @@ void ivas_dirac_dec_render_sf( 
                nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

                n_slots_to_render = st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->subframes_rendered];

                n_samples_to_render = hSpatParamRendCom->num_freq_bands * n_slots_to_render;

                tc_offset = st_ivas->hTcBuffer->n_samples_rendered;

                interp_offset = st_ivas->hTcBuffer->n_samples_rendered;



                if ( st_ivas->hCombinedOrientationData && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] )

lib_dec/ivas_spar_decoder.c

+14 −13
Original line number Diff line number Diff line
@@ -1649,8 +1649,7 @@ void ivas_spar_dec_upmixer_sf( 
            for ( i = 0; i < nchan_transport; i++ )

            {

                tmp = roundf( output[i][j] * PCM16_TO_FLT_FAC );

                pcm = ( tmp > MAX16B_FLT ) ? MAX16B : ( tmp < MIN16B_FLT ) ? MIN16B

                                                                           : (short) tmp;

                pcm = ( tmp > MAX16B_FLT ) ? MAX16B : ( tmp < MIN16B_FLT ) ? MIN16B : (short) tmp;

                dbgwrite( &pcm, sizeof( int16_t ), 1, 1, "dmx_dec.raw" );

            }

        }
@@ -1904,10 +1903,12 @@ void ivas_spar_dec_upmixer_sf( 
            }

            else

            {

                if ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA ||

                if ( (hDecoderConfig->output_config == AUDIO_CONFIG_FOA ||

                     !( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

                        || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM

                          || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

                          )

#endif

                          )

#ifdef OSBA_ROOM_IR