Commit 2449a9f3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/fix-check-format-to-ensure-one-newline-at-eof

parents db1515cb 9f58d491

ci/remove_unsupported_testcases.py

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ TESTCASES = [ 
    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment",

    "OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",

    "stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out",

    "SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

    "SBA 2OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

    "SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, EXT out",

    "Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out",

    "Multi-channel 5_1_2 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, EXT out",

    "Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, EXT out",

    "Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, EXT out",

    "Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out",

]

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ 
#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#endif

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif

lib_isar/isar_prot.h

+8 −0
Original line number Diff line number Diff line
@@ -317,6 +317,14 @@ int32_t isar_get_lc3plus_bitrate( 
    const int16_t split_prerender_frame_size_ms );

#endif



#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const int32_t nChannels,

    const int32_t codecFrameDurationUs );

#endif



ivas_error isar_split_rend_validate_config(

    const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,

    const int16_t pcm_out_flag );

lib_isar/isar_splitRendererPre.c

+15 −0
Original line number Diff line number Diff line
@@ -1969,7 +1969,11 @@ ivas_error split_renderer_open_lc3plus( 


    if ( ( error = ISAR_LC3PLUS_ENC_Open( config,

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

                                          isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, config.channels, config.lc3plus_frame_duration_us ),

#else

                                          isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode ),

#endif

#else

                                          isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, (int16_t) ( config.isar_frame_duration_us / 1000 ) ),

#endif
@@ -2229,7 +2233,18 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        {

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            if ( pBits->pose_correction == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE )

            {

                available_bits = isar_get_lc3plus_bitrate( SplitRendBitRate, hSplitBin->multiBinPoseData.poseCorrectionMode, hSplitBin->hLc3plusEnc->config.channels, hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us ) / FRAMES_PER_SEC;

            }

            else

            {

                available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

            }

#else

            available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

#endif

            if ( ( error = splitRendLc3plusEncodeAndWrite( hSplitBin, pBits, available_bits, in ) ) != IVAS_ERR_OK )

#else

            available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

lib_isar/isar_splitRenderer_utils.c

+24 −0
Original line number Diff line number Diff line
@@ -563,6 +563,30 @@ int32_t isar_get_lcld_bitrate( 
    return -1;

}



#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

/*-------------------------------------------------------------------------

 * Function isar_get_lc3plus_bitrate()

 *

 *

 *------------------------------------------------------------------------*/



int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const int32_t nChannels,

    const int32_t codecFrameDurationUs )

{

    int32_t bitrate;

    bitrate = isar_get_lcld_bitrate( SplitRendBitRate, poseCorrectionMode );

    /* Check for LC3plus LEA 48_6 LC3 compatibility mode signalling */

    if ( ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE == poseCorrectionMode && bitrate == 256000 && nChannels == 2 && codecFrameDurationUs == 10000 )

    {

        bitrate = 2 * 126000;

    }

    return bitrate;

}

#endif





#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS

/*-------------------------------------------------------------------------