Commit 59eadb4d authored by TYAGIRIS's avatar TYAGIRIS
Browse files

replace is_5msframe with num_subframes

parent f45cc01a

apps/decoder.c

+3 −3
Original line number Diff line number Diff line
@@ -673,10 +673,10 @@ int main( 


#ifdef SPLIT_REND_LCLD_5MS

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( asked_frame_size == IVAS_RENDER_FRAMESIZE_5MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||

        if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ||

                                                                 renderConfig.split_rend_config.dof == 0 ) )

        {

            arg.renderFramesize = IVAS_RENDER_FRAMESIZE_5MS;

            arg.renderFramesize = asked_frame_size;

        }

        else

        {

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static ivas_error ivas_dec_init_split_rend( 
    }



#ifdef SPLIT_REND_LCLD_5MS

    if ( ( error = ivas_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, st_ivas->hDecoderConfig->render_framesize == IVAS_RENDER_FRAMESIZE_5MS ) ) != IVAS_ERR_OK )

    if ( ( error = ivas_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;

    }

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ ivas_error ivas_split_rend_choose_default_codec( 
    int16_t *pCodec_frame_size_ms, /* i/o: pointer to codec frame size setting     */

    const int16_t cldfb_in_flag,   /* i  : flag indicating rendering in TD         */

    const int16_t pcm_out_flag,    /* i  : flag to indicate PCM output             */

    const int16_t is_5ms_frame     /* i  : flag to indicate 5ms framing            */

    const int16_t num_subframes    /* i  : number of subframes                     */

);

#else

ivas_error ivas_split_rend_choose_default_codec(

lib_rend/ivas_splitRenderer_utils.c

+2 −9
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ ivas_error ivas_split_rend_choose_default_codec( 
    int16_t *pCodec_frame_size_ms, /* i/o: pointer to codec frame size setting     */

    const int16_t cldfb_in_flag,   /* i  : flag indicating rendering in TD         */

    const int16_t pcm_out_flag,    /* i  : flag to indicate PCM output             */

    const int16_t is_5ms_frame     /* i  : flag to indicate 5ms framing             */

    const int16_t num_subframes    /* i  : number of subframes                     */

)

#else

ivas_error ivas_split_rend_choose_default_codec(
@@ -1088,14 +1088,7 @@ ivas_error ivas_split_rend_choose_default_codec( 
        {

            case IVAS_SPLIT_REND_CODEC_LCLD:

#ifdef SPLIT_REND_LCLD_5MS

                if ( is_5ms_frame )

                {

                    *pCodec_frame_size_ms = 5;

                }

                else

                {

                    *pCodec_frame_size_ms = 20;

                }

                *pCodec_frame_size_ms = num_subframes * 5;

#else

                *pCodec_frame_size_ms = 20;

#endif

lib_rend/lib_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -4016,7 +4016,7 @@ ivas_error IVAS_REND_AddInput( 
        cldfb_in_flag = getCldfbRendFlag( hIvasRend, getAudioConfigType( inConfig ) );



#ifdef SPLIT_REND_LCLD_5MS

        if ( ( error = ivas_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 == 1 ) ? 1 : 0 ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_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;

        }
@@ -4913,7 +4913,7 @@ int16_t IVAS_REND_FeedRenderConfig( 
        closeSplitRend( &hIvasRend->splitRendWrapper, &hIvasRend->splitRendEncBuffer );



#ifdef SPLIT_REND_LCLD_5MS

        if ( ( error = ivas_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 == 1 ) ? 1 : 0 ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_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;

        }