Commit 5937dc9e authored by vaclav's avatar vaclav
Browse files

- fix porting 

- remove doubled initialization
parent 7b218f96

lib_dec/ivas_dirac_dec_fx.c

+0 −11
Original line number Diff line number Diff line
@@ -2271,16 +2271,6 @@ void ivas_dirac_dec_render_sf_fx( 
    move16();

    move16();





    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

        {

            set32_fx( Cldfb_RealBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

            set32_fx( Cldfb_ImagBuffer_fx[i][j], 0, CLDFB_NO_CHANNELS_MAX );

        }

    }



    /* local copies of azi, ele, diffuseness */

    Word16 azimuth[CLDFB_NO_CHANNELS_MAX];

    Word16 elevation[CLDFB_NO_CHANNELS_MAX];
@@ -2327,7 +2317,6 @@ void ivas_dirac_dec_render_sf_fx( 
    push_wmops( "ivas_dirac_dec_render" );



    /* Initialize aux buffers */



    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

    {

        FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )

lib_dec/ivas_init_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ ivas_error ivas_init_decoder_fx( 
        test();

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        test();

        IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && !( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) ) )

        IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && !( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) ) )

#else

        IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) )

#endif