Commit 0c191b4c authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

fix for crash in LCLD mode when codec frame size is less than isar frame size

parent 5227100d

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 
#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */



#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */



/* ##################### End NON-BE switches ########################### */

lib_isar/lib_isar_pre_rend.c

+9 −0
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ ivas_error ISAR_PRE_REND_open( 
        }

        else

        {

#ifndef FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE

            int16_t iNumBlocksPerFrame;

            iNumBlocksPerFrame = ( CLDFB_NO_COL_MAX * pSplitRendConfig->codec_frame_size_ms ) / 20;

#else                                    

            int16_t iNumBlocksPerFrame, iNumLCLDIterationsPerFrame;

            if ( pSplitRendConfig->codec_frame_size_ms > 0 )

            {
@@ -165,8 +169,13 @@ ivas_error ISAR_PRE_REND_open( 
                iNumLCLDIterationsPerFrame = 1;

                iNumBlocksPerFrame = CLDFB_NO_COL_MAX;

            }

#endif            



#ifndef FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE

            if ( ( error = isar_splitBinLCLDEncOpen( &hSplitBinRend->hSplitBinLCLDEnc, output_Fs, BINAURAL_CHANNELS, isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, hSplitBinRend->multiBinPoseData.poseCorrectionMode ), iNumBlocksPerFrame, 1 ) ) != IVAS_ERR_OK )

#else

            if ( ( error = isar_splitBinLCLDEncOpen( &hSplitBinRend->hSplitBinLCLDEnc, output_Fs, BINAURAL_CHANNELS, isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, hSplitBinRend->multiBinPoseData.poseCorrectionMode ), iNumBlocksPerFrame, iNumLCLDIterationsPerFrame ) ) != IVAS_ERR_OK )

#endif            

            {

                return error;

            }