Commit 2d426c3f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

port FIX_1437_LC3PLUS_EXTREND_HIRES

parent 028d6837

apps/renderer.c

+9 −0
Original line number Diff line number Diff line
@@ -1548,7 +1548,16 @@ int main( 
            audioWriter = NULL;

        }



#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend,

                                                              &bitsBuffer.config.codec,

                                                              &bitsBuffer.config.poseCorrection,

                                                              &bitsBuffer.config.codec_frame_size_ms,

                                                              &bitsBuffer.config.isar_frame_size_ms,

                                                              &bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader(): %s!\n", ivas_error_to_string( error ) );

            goto cleanup;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
#define FIX_1419_MONO_STEREO_UMX                        /* FhG: fix for issue 1419 : support upmix to all output formats for mono and stereo */

#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG       /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */

#define FIX_1437_LC3PLUS_EXTREND_HIRES                  /* FhG: fix external renderer split bitstream header writing causing a crash for LC3plus High-res mode */

#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV               /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */



// object-editing feature porting

lib_isar/isar_splitRendererPre.c

+3 −0
Original line number Diff line number Diff line
@@ -2876,6 +2876,9 @@ ivas_error splitRendLc3plusEncodeAndWrite( 
    pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

    pBits->codec_frame_size_ms = (Word16) ( hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us / 1000 );

    pBits->isar_frame_size_ms = (Word16) ( hSplitBin->hLc3plusEnc->config.isar_frame_duration_us / 1000 );

#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

    pBits->lc3plus_highres = hSplitBin->hLc3plusEnc->config.high_res_mode_enabled;

#endif



    return IVAS_ERR_OK;

}

lib_rend/lib_rend.h

+6 −1
Original line number Diff line number Diff line
@@ -294,7 +294,12 @@ ivas_error IVAS_REND_GetSplitRendBitstreamHeader( 
    ISAR_SPLIT_REND_CODEC *pCodec,                  /* o  : pointer to codec setting                            */

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

    Word16 *pCodec_frame_size_ms,                   /* o  : pointer to codec frame size setting                 */

#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

    Word16 *pIsar_frame_size_ms,                   /* o  : pointer to ISAR frame size setting                  */

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

#else

    Word16 *pIsar_frame_size_ms                    /* o  : pointer to ISAR frame size setting                  */

#endif

);



ivas_error IVAS_REND_SetHeadRotation(

lib_rend/lib_rend_fx.c

+9 −1
Original line number Diff line number Diff line
@@ -9620,7 +9620,12 @@ ivas_error IVAS_REND_GetSplitRendBitstreamHeader( 
    ISAR_SPLIT_REND_CODEC *pCodec,                        /* o  : pointer to codec setting              */

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

    Word16 *pCodec_frame_size_ms,                         /* o  : pointer to codec frame size setting   */

#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

    Word16 *pIsar_frame_size_ms, /* o  : pointer to ISAR frame size setting      */

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

#else

    Word16 *pIsar_frame_size_ms /* o  : pointer to ISAR frame size setting      */

#endif

)

{

    test();
@@ -9633,6 +9638,9 @@ ivas_error IVAS_REND_GetSplitRendBitstreamHeader( 
    *pCodec_frame_size_ms = hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms;

    *pIsar_frame_size_ms = hIvasRend->hRendererConfig->split_rend_config.isar_frame_size_ms;

    *poseCorrection = hIvasRend->hRendererConfig->split_rend_config.poseCorrectionMode;

#ifdef FIX_1437_LC3PLUS_EXTREND_HIRES

    *pLc3plusHighRes = hIvasRend->hRendererConfig->split_rend_config.lc3plus_highres;

#endif



    return IVAS_ERR_OK;

}