Commit 5ba9ee12 authored by sagnowski's avatar sagnowski
Browse files

Unify preprocessor switches into one ISAR_BITSTREAM_UPDATE_LC3PLUS

parent cf16d35f

lib_com/common_api_types.h

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ typedef struct _ISAR_SPLIT_REND_BITS_DATA 
    int16_t codec_frame_size_ms;

    ISAR_SPLIT_REND_CODEC codec;

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int16_t isar_frame_size_ms;

    int16_t lc3plus_highres;

#endif
@@ -278,14 +278,14 @@ typedef struct _ISAR_SPLIT_REND_CONFIG 
                              3 - (3dof correction. By default YAW, PITCH and ROLL correction)

                              */

    int16_t codec_delay_ms;   /*PLACEHOLDER (currently being ignored) : look ahead delay of the codec that is used to code BIN signal output of pre-renderer*/

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int16_t isar_frame_size_ms; /* ISAR bit stream frame size in milliseconds */

#endif

    int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;

    ISAR_SPLIT_REND_CODEC codec;

    ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int16_t lc3plus_highres;

#endif

lib_com/ivas_error.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ typedef enum 
     *----------------------------------------*/

    IVAS_ERR_INVALID_BITSTREAM = 0x2000,

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    IVAS_ERR_UNEXPECTED_LC3PLUS_BITSTREAM,

    IVAS_ERR_UNEXPECTED_LC3PLUS_BITSTREAM_CONFIG,

#endif

lib_com/options.h

+1 −8
Original line number Diff line number Diff line
@@ -155,14 +155,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define LC3PLUS_RTP_PAYLOAD_FORMAT                  /* FhG: uses the official RTP payload format instead of raw frames for the LC3plus bit stream*/

#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT

#define LC3PLUS_VBR                                 /* FhG: re-uses unused pose correction bits for coding audio with LC3plus */

#endif

#define SPLIT_REND_EXTEND_ISAR_FILE_HEADER          /* FhG: Adds more fields to ISAR bitstream file header:

                                                              - LC3plus HIRES flag, coding sample rate - required to open LC3plus decoder before decoding first frame.

                                                              - ISAR frame size - fixes 10ms framing in ISAR. */

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



#define FIX_NUM_SUBFRAME_UPDATE

lib_dec/lib_dec.c

+7 −7
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static ivas_error isar_set_split_rend_setup( 
    splitRendBits->codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

    splitRendBits->pose_correction = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    splitRendBits->codec_frame_size_ms = 0;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    splitRendBits->isar_frame_size_ms = 0;

    splitRendBits->lc3plus_highres = 0;

#endif
@@ -1234,7 +1234,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
                                                          Quaternion,

                                                          st_ivas->hRenderConfig->split_rend_config.splitRendBitRate,

                                                          st_ivas->hRenderConfig->split_rend_config.codec,

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

                                                          st_ivas->hRenderConfig->split_rend_config.isar_frame_size_ms,

#endif

                                                          st_ivas->hRenderConfig->split_rend_config.codec_frame_size_ms,
@@ -2123,14 +2123,14 @@ static ivas_error copyRendererConfigStruct( 
    hRCout->split_rend_config.dof = 3;

    hRCout->split_rend_config.hq_mode = 0;

    hRCout->split_rend_config.codec_delay_ms = 0;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    hRCout->split_rend_config.isar_frame_size_ms = 20;

#endif

    hRCout->split_rend_config.codec_frame_size_ms = 0; /* 0 means "use default for selected codec" */

    hRCout->split_rend_config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

    hRCout->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;

    hRCout->split_rend_config.rendererSelection = hRCin->split_rend_config.rendererSelection;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    hRCout->split_rend_config.lc3plus_highres = hRCin->split_rend_config.lc3plus_highres;

#endif

#endif
@@ -3824,11 +3824,11 @@ ivas_error IVAS_DEC_GetSplitRendBitstreamHeader( 
    IVAS_DEC_HANDLE hIvasDec,                             /* i/o: IVAS decoder handle                                                     */

    ISAR_SPLIT_REND_CODEC *pCodec,                        /* o: pointer to codec setting                */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE *poseCorrection, /* o: pointer to pose correction mode                */

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int16_t *pIsar_frame_size_ms, /* o: pointer to isar frame size setting     */

#endif

    int16_t *pCodec_frame_size_ms /* o: pointer to codec frame size setting     */

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    ,

    int16_t *pLc3plusHighRes

#endif
@@ -3842,7 +3842,7 @@ ivas_error IVAS_DEC_GetSplitRendBitstreamHeader( 
    *pCodec = hIvasDec->st_ivas->hRenderConfig->split_rend_config.codec;

    *pCodec_frame_size_ms = hIvasDec->st_ivas->hRenderConfig->split_rend_config.codec_frame_size_ms;

    *poseCorrection = hIvasDec->st_ivas->hRenderConfig->split_rend_config.poseCorrectionMode;

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    *pIsar_frame_size_ms = hIvasDec->st_ivas->hRenderConfig->split_rend_config.isar_frame_size_ms;

    *pLc3plusHighRes = hIvasDec->st_ivas->hRenderConfig->split_rend_config.lc3plus_highres;

#endif

lib_dec/lib_dec.h

+2 −2
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ ivas_error IVAS_DEC_GetSplitRendBitstreamHeader( 
    IVAS_DEC_HANDLE hIvasDec,                              /* i/o: IVAS decoder handle                                                     */

    ISAR_SPLIT_REND_CODEC *pCodec,                         /* o: pointer to codec setting                */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE *poseCorrection,  /* o: pointer to pose correction mode                */

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int16_t *pIsar_frame_size_ms,                          /* o: pointer to isar frame size setting     */

#endif

    int16_t *pCodec_frame_size_ms                          /* o: pointer to codec frame size setting     */

#ifdef SPLIT_REND_EXTEND_ISAR_FILE_HEADER

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    ,

    int16_t *pLc3plusHighRes                               /* o: pointer to LC3plus High-Res setting     */

#endif