Commit b656694a authored by emerit's avatar emerit
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1076-executables-generate_crend_ivas_tables-and-table_format_converter-do-not-build
parents f560aa45 b4d6bd84

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ ivas-conformance: 
  timeout: "60 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

#    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

  allow_failure:

    exit_codes:

      - 123

apps/decoder.c

+17 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,15 @@ static bool parseCmdlIVAS_dec( 
            usage_dec();

            return false;

        }



#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

        if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );

            usage_dec();

            return false;

        }

#endif

    }

    else

    {
@@ -1990,6 +1999,14 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {

#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

            if ( arg.outputMdFilename == NULL )

            {

                fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );

                return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;

            }

#endif



            if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nUnable to open output split rendering metadata file %s\n", arg.outputWavFilename );

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



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



/* #################### End BE switches ################################## */

lib_isar/lib_isar_post_rend.c

+1 −15
Original line number Diff line number Diff line
@@ -1164,20 +1164,6 @@ int16_t ISAR_POST_REND_GetRenderConfig( 
    }



    hRCin = hIvasRend->splitRenderConfig;

#ifdef DEBUGGING

    switch ( hRCin->renderer_type_override )

    {

        case IVAS_RENDER_TYPE_OVERRIDE_CREND:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;

            break;

        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;

            break;

        default:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

            break;

    }

#endif



    splitRenderConfig->splitRendBitRate = SPLIT_REND_768k;

    splitRenderConfig->dof = 3;
@@ -1804,7 +1790,7 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 
 *-------------------------------------------------------------------*/



int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend )

    ISAR_POST_REND_HANDLE hIvasRend )

{

    return hIvasRend->numClipping;

}

lib_isar/lib_isar_post_rend.h

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 


#ifdef DEBUGGING

int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

    ISAR_POST_REND_HANDLE hIvasRend                /* i  : Renderer handle                                     */

);



int32_t ISAR_POST_REND_GetCntFramesLimited(

    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

    ISAR_POST_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

);

#endif