Commit 60fe634b authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into RTP_revision

parents c5b42612 05cecedb

apps/renderer.c

+9 −0
Original line number Diff line number Diff line
@@ -1449,7 +1449,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()!\n" );

            goto cleanup;

ci/basop-pages/basop_index.html

+2 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


  <h2>Test Coverage</h2>



  <ul>

    <li><a href="coverage_enc_dec_rend/index.html">Coverage report</a></li>

  </ul>

  {}

  

</body>

ci/setup_pages.py

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ JOBS_BASOP_REPO = { 
    "complexity-osba-in-binaural_room_ir-out": "OSBA in, BINAURAL_ROOM_IR out",

    "complexity-stereo-in-stereo-out": "Stereo in, Stereo out",

    # "timeless" jobs (not complexity)

    "coverage-test-on-main-scheduled": "Coverage",

    "ivas-conformance-linux": "Conformance test coverage",

    "ivas-long-term-job-logs-overview": "Long term logs",

}

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ 
#define RENDERER_MD_SYNC_DELAY_TO_INTEGER               /* FhG: change data type of metadata sync delay in ext renderer to int16_t for better BASOP portability (and nicer code) */

#define FIX_1427_OBJ_EDITING_EXT_METADATA               /* Eri: Add support for extended metadata in object editing */

#define FIX_1419_MONO_STEREO_UMX                        /* FhG: fix for issue 1419 : support upmix to all output formats for mono and stereo */

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



#define FIX_1318_ROOM_SIZE_CMD_LINE                     /* Philips/Nokia: Default room sizes support */

lib_isar/isar_splitRendererPre.c

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

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

    pBits->isar_frame_size_ms = (int16_t) ( 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;

}