Commit 81f8749d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Add fix to SBA mode being uninitialized.

parent 55ef9075

lib_rend/lib_rend.c

+6 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,8 @@ static ivas_error initMasaDummyDecForMcOut( input_masa *inputMasa, IVAS_REND_Aud 
    decDummy->hDecoderConfig->output_config = output_config;



    decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */

    decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */



    ivas_output_init( &( decDummy->hOutSetup ), output_config );

    ivas_output_init( &( decDummy->hIntSetup ), output_config );
@@ -1896,6 +1898,8 @@ static ivas_error initMasaDummyDecForSbaOut( input_masa *inputMasa, IVAS_REND_Au 
    decDummy->hDecoderConfig->output_config = output_config;



    decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */

    decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */



    ivas_output_init( &( decDummy->hOutSetup ), output_config );

    ivas_output_init( &( decDummy->hIntSetup ), output_config );

    decDummy->renderer_type = RENDERER_DIRAC;
@@ -1960,6 +1964,8 @@ static ivas_error initMasaDummyDecForBinauralOut( input_masa *inputMasa, IVAS_RE 
    output_config = decDummy->hDecoderConfig->output_config;



    decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */

    decDummy->sba_mode = SBA_MODE_NONE; /* Todo Nokia: This is done to prevent ivas_dirac_dec_config() to not use uninitialized value. It could be considered if this should not be even accessed when not in SBA. */



    ivas_output_init( &( decDummy->hOutSetup ), output_config );

    if ( output_config == AUDIO_CONFIG_BINAURAL )

    {