Commit 0ce0cbe1 authored by sagnowski's avatar sagnowski
Browse files

Initialise flags using if statements

parent 6c090f8b
Loading
Loading
Loading
Loading
+16 −3
Original line number Diff line number Diff line
@@ -1297,8 +1297,16 @@ static ivas_error isar_generate_metadata_and_bitstream(
    hSplitBinRend = st_ivas->hSplitBinRend;

    max_band = extract_l( ar_div( imult3216( st_ivas->hDecoderConfig->output_Fs, BINAURAL_MAXBANDS ), 48000 ) );
    pcm_out_flag = extract_l( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) );
    move16();
    cldfb_in_flag = ivas_dec_split_rend_cldfb_in( st_ivas->renderer_type );
    move16();
    pcm_out_flag = 0;
    move16();
    if( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
    {
        pcm_out_flag = 1;
        move16();
    }

    n_samples_in_cldfb_slot = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
    assert( nSamples % n_samples_in_cldfb_slot == 0 );
@@ -1602,10 +1610,15 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
        return IVAS_ERR_WRONG_PARAMS;
    }

    pcm_out_flag = extract_l( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) );
    move16();
    numSamplesPerChannelToOutput = isar_get_frame_size( st_ivas );
    move16();
    pcm_out_flag = 0;
    move16();
    if( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
    {
        pcm_out_flag = 1;
        move16();
    }

    IF( ( error = isar_render_poses( hIvasDec, numSamplesPerChannelToOutput, nOutSamples, needNewFrame ) ) != IVAS_ERR_OK )
    {