Commit ac2ef780 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

implement output conversion for SBA format

parent 254ca1e5

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ static bool parseCmdlIVAS_dec( 
            else

            {

                tmp = -1; /* this is to avoid a compilation warning */

                fprintf( stderr, "Error: SBA input convention must be specified, expecting a number!\n\n" );

                fprintf( stderr, "Error: SBA ouput convention must be specified, expecting a number!\n\n" );

                usage_dec();

                return false;

            }

lib_dec/ivas_sba_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -840,6 +840,19 @@ ivas_error ivas_sba_dec_render( 
        }

    }



#ifdef AMBISONICS_CONVENTIONS

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA  || 

		 st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA2 || 

		 st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_HOA3 

		)

    {

        if ( st_ivas->hDecoderConfig->sba_output_fmt != 0 )

        {

            convert_ambi_format( output_f, output_f, st_ivas->sba_analysis_order, AMBI_FMT_ACN_SN3D, st_ivas->hDecoderConfig->sba_output_fmt );

        }

    }

#endif



    if ( st_ivas->hDirAC != NULL && hSpar->slots_rendered == hSpar->num_slots )

    {

        if ( st_ivas->hDirAC->hConfig->dec_param_estim == 1 )

lib_dec/ivas_spar_decoder.c

+1 −0
Original line number Diff line number Diff line
@@ -1717,6 +1717,7 @@ void ivas_spar_dec_upmixer_sf( 
    ivas_spar_dump_signal_wav( output_frame, NULL, output, hSpar->numOutChannels, spar_foa_dec_wav[3], "cldfbSynthesis()" );

#endif





    hSpar->slots_rendered += hSpar->subframe_nbslots[hSpar->subframes_rendered];

    hSpar->subframes_rendered++;