Commit 4df7e82c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] crash for MASA split-pre rendering and update for 0DoF tests

parent a37b812b

lib_rend/lib_rend.c

+7 −11
Original line number Diff line number Diff line
@@ -9309,7 +9309,9 @@ ivas_error IVAS_REND_GetSamples( 
    int16_t numOutChannels;

#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t cldfb2tdSampleFact;

#ifndef API_5MS

    IVAS_REND_AudioBuffer outAudioOrig;

#endif

#endif



    /* Validate function arguments */
@@ -9399,7 +9401,9 @@ ivas_error IVAS_REND_GetSamples( 




#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef API_5MS

    outAudioOrig = outAudio;

#endif

    /* Use internal buffer if outputting split rendering bitstream */

    if ( ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||

         ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
@@ -9518,7 +9522,9 @@ ivas_error IVAS_REND_GetSamples( 
            return error;

        }

        convertInternalBitsBuffToBitsBuffer( hBits, bits );

#ifndef API_5MS

        outAudio = outAudioOrig;

#endif

        if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            accumulate2dArrayToBuffer( tmpBinaural, &outAudio );
@@ -9552,17 +9558,7 @@ ivas_error IVAS_REND_GetSplitBinauralBitstream( 
{

    int16_t cldfb_in;



    cldfb_in = 0;

    if ( hIvasRend->hRendererConfig->split_rend_config.rendererSelection == IVAS_SPLIT_REND_RENDERER_SELECTION_FASTCONV )

    {

#ifdef DEBUGGING

        cldfb_in = 1;

#endif

        if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

        {

            cldfb_in = 1;

        }

    }

    cldfb_in = getCldfbRendFlag( hIvasRend, IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN );

    hIvasRend->splitRendEncBuffer.config.is_cldfb = cldfb_in;

    if ( hIvasRend->hRendererConfig->split_rend_config.codec == IVAS_SPLIT_REND_CODEC_LC3PLUS &&

         ( hIvasRend->hRendererConfig->split_rend_config.dof == 0 || hIvasRend->hRendererConfig->split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) )

tests/split_rendering/utils.py

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ def run_external_split_rendering( 
        if in_meta_files:

            cmd[9:9] = ["-im", *in_meta_files]



        if "0dof" in render_config.name:

            cmd.append("-fr5")



        run_cmd(cmd)



        # run split renderer