Commit 04021968 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'isar_selection_branch' into isar_selection_branch_cleanup

parents 8bcdac7e 9b16d0af

lib_isar/lib_isar_post_rend.c

+24 −13
Original line number Diff line number Diff line
@@ -1343,7 +1343,8 @@ static ivas_error splitBinLc3plusDecode( 
    ISAR_SPLIT_POST_REND_WRAPPER *hSplitBin,

    ISAR_SPLIT_REND_BITS_HANDLE bits,

    float outputBuffer[BINAURAL_CHANNELS][L_FRAME48k],

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction )

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction,

    const int16_t SplitRendBFI )

{

    ivas_error error;

    float *channel_ptrs[MAX_HEAD_ROT_POSES * 2];
@@ -1352,6 +1353,13 @@ static ivas_error splitBinLc3plusDecode( 
    push_wmops( "splitBinLc3plusDecode" );

    assert( hSplitBin->hLc3plusDec != NULL );



    for ( int16_t i = 0; i < BINAURAL_CHANNELS * hSplitBin->multiBinPoseData.num_poses; ++i )

    {

        channel_ptrs[i] = outputBuffer[i];

    }



    if ( SplitRendBFI == 0 )

    {

        /* Find next byte boundary */

        while ( bits->bits_read % 8 != 0 )

        {
@@ -1361,15 +1369,18 @@ static ivas_error splitBinLc3plusDecode( 
        lc3plusBitrateId = ISAR_SPLIT_REND_BITStream_read_int32( bits, 8 );

        lc3plusBitstreamSize = isar_get_lc3plus_size_from_id( (int8_t) lc3plusBitrateId, pose_correction, (int16_t) ( hSplitBin->hLc3plusDec->config.ivas_frame_duration_us / 1000 ) );



    for ( int16_t i = 0; i < BINAURAL_CHANNELS; ++i )

        if ( ( error = IVAS_LC3PLUS_DEC_Decode( hSplitBin->hLc3plusDec, &bits->bits_buf[bits->bits_read / 8], lc3plusBitstreamSize, channel_ptrs ) ) != IVAS_ERR_OK )

        {

        channel_ptrs[i] = outputBuffer[i];

            return error;

        }



    if ( ( error = IVAS_LC3PLUS_DEC_Decode( hSplitBin->hLc3plusDec, &bits->bits_buf[bits->bits_read / 8], lc3plusBitstreamSize, channel_ptrs ) ) != IVAS_ERR_OK )

    }

    else

    {

        if ( ( error = IVAS_LC3PLUS_DEC_Conceal( hSplitBin->hLc3plusDec, channel_ptrs ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }



    pop_wmops();

    return IVAS_ERR_OK;
@@ -1505,7 +1516,7 @@ static ivas_error renderSplitBinauralWithPostRot( 
                    }

                    else

                    {

                        if ( ( error = splitBinLc3plusDecode( hSplitBin, &bits, tmpCrendBuffer, bits.pose_correction ) ) != IVAS_ERR_OK )

                        if ( ( error = splitBinLc3plusDecode( hSplitBin, &bits, tmpCrendBuffer, bits.pose_correction, SplitRendBFI ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

tests/split_rendering/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ RENDERER_CONFIGS_TO_TEST_OMASA = ( 
RENDERER_CONFIGS_TO_TEST_OSBA = (

    RENDERER_CONFIGS_DEFAULT_CODEC + RENDERER_CONFIGS_LC3PLUS_CODEC

)

RENDERER_CONFIGS_TO_TEST_PLC = RENDERER_CONFIGS_FASTCONV_RENDERER

RENDERER_CONFIGS_TO_TEST_PLC = RENDERER_CONFIGS_FASTCONV_RENDERER + RENDERER_CONFIGS_LC3PLUS_CODEC



""" Trajectories """

SPLIT_REND_HR_TRAJECTORIES_TO_TEST = [