Commit 32751f56 authored by vaclav's avatar vaclav
Browse files

more cleaning + introduce the fix for mono -> FOA

parent d6aa0e52

lib_dec/ivas_jbm_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -961,9 +961,9 @@ ivas_error ivas_jbm_dec_render( 
            for ( n = 0; n < *nSamplesRendered; n++ )

            {

                float tmp;

                tmp = p_output[0][n];

                p_output[0][n] = 0.5f * ( tmp + p_output[1][n] ); /* W = 0.5 * ( L + R ) */

                p_output[1][n] = 0.5f * ( tmp - p_output[1][n] ); /* Y = 0.5 * ( L - R ) */

                tmp = p_tc[0][n];

                p_output[0][n] = 0.5f * ( tmp + p_tc[1][n] ); /* W = 0.5 * ( L + R ) */

                p_output[1][n] = 0.5f * ( tmp - p_tc[1][n] ); /* Y = 0.5 * ( L - R ) */

            }

        }

#endif /* FIX_1419_MONO_STEREO_UMX */

lib_dec/ivas_output_config.c

+1 −7
Original line number Diff line number Diff line
@@ -86,11 +86,9 @@ void ivas_renderer_select( 
        if ( st_ivas->ivas_format == MONO_FORMAT )

        {

            *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX;

            *internal_config = IVAS_AUDIO_CONFIG_MONO;

        }

        else if ( st_ivas->ivas_format == STEREO_FORMAT )

        {

            *internal_config = IVAS_AUDIO_CONFIG_STEREO;

            *renderer_type = RENDERER_DISABLE;

        }

        else if ( st_ivas->ivas_format == ISM_FORMAT )
@@ -269,9 +267,7 @@ void ivas_renderer_select( 
#ifdef FIX_1419_MONO_STEREO_UMX

    else if ( st_ivas->ivas_format == MONO_FORMAT )

    {

        *internal_config = IVAS_AUDIO_CONFIG_MONO;



        if ( output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_HOA3 )

        if ( output_config == IVAS_AUDIO_CONFIG_STEREO  )

        {

            *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX;

        }
@@ -282,8 +278,6 @@ void ivas_renderer_select( 
    }

    else if ( st_ivas->ivas_format == STEREO_FORMAT )

    {

        *internal_config = IVAS_AUDIO_CONFIG_STEREO;



        if ( output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_HOA3 )

        {

            *renderer_type = RENDERER_SBA_LINEAR_ENC;