Commit eddf9a0a authored by Adam Mills's avatar Adam Mills
Browse files

Removing commented code.

parent 38a672c9

lib_dec/ivas_init_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -265,11 +265,6 @@ static ivas_error ivas_dec_init_split_rend( 
        }

    }



    // if ( ( error = isar_split_rend_choose_default_codec( &st_ivas->hRenderConfig->split_rend_config.codec, &st_ivas->hRenderConfig->split_rend_config.codec_frame_size_ms, cldfb_in_flag, pcm_out_flag, (int16_t) st_ivas->hDecoderConfig->render_framesize ) ) != IVAS_ERR_OK )

    // {

    //     return error;

    // }



    int16_t mixed_td_cldfb_flag = 0;

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef FIX_766_OMASA_SPLIT_REND

lib_isar/isar_splitRendererPre.c

+0 −9
Original line number Diff line number Diff line
@@ -2396,15 +2396,6 @@ ivas_error isar_pre_rend_MultiBinToSplitBinaural( 
        set_pose_types( hSplitBin->hBinHrSplitPreRend->pose_type, &hSplitBin->multiBinPoseData );

    }



    /* Needs to be done at runtime. If this was in another API function,

     * there would be no guarantee that the user did not change

     * the split rendering config before calling the main rendering function */

    // if ( ( error = isar_split_rend_choose_default_codec( &splitCodec, &codec_frame_size_ms, cldfb_in_flag, pcm_out_flag, 0 ) ) != IVAS_ERR_OK )

    // {

    //     return error;

    // }





    if ( cldfb_in_flag == 0 )

    {

        /*TD input*/

lib_rend/lib_rend.c

+0 −10
Original line number Diff line number Diff line
@@ -3582,11 +3582,6 @@ ivas_error IVAS_REND_AddInput( 
        int16_t cldfb_in_flag;

        cldfb_in_flag = getCldfbRendFlag( hIvasRend, getAudioConfigType( inConfig ) );



        // if ( ( error = isar_split_rend_choose_default_codec( &hIvasRend->hRendererConfig->split_rend_config.codec, &hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms, cldfb_in_flag, hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM, hIvasRend->num_subframes ) ) != IVAS_ERR_OK )

        // {

        //     return error;

        // }



        if ( ( error = isar_pre_rend_init( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, hIvasRend->outputConfig, cldfb_in_flag, hIvasRend->num_subframes ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -4424,11 +4419,6 @@ int16_t IVAS_REND_FeedRenderConfig( 
        cldfb_in_flag = getCldfbRendFlag( hIvasRend, IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN );

        isar_pre_rend_close( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer );



        // if ( ( error = isar_split_rend_choose_default_codec( &hIvasRend->hRendererConfig->split_rend_config.codec, &hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms, cldfb_in_flag, hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM, hIvasRend->num_subframes ) ) != IVAS_ERR_OK )

        // {

        //     return error;

        // }



        if ( ( error = isar_pre_rend_init( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer, &hIvasRend->hRendererConfig->split_rend_config, hIvasRend->headRotData, hIvasRend->sampleRateOut, hIvasRend->outputConfig, cldfb_in_flag, hIvasRend->num_subframes ) ) != IVAS_ERR_OK )

        {

            return error;