Commit 7ea572cf authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into 1215-decoder-crash-for-mc-5-1-at-192kbps-jbm-error-profile-6-2

parents 16a50ea9 783c4431

.gitlab-ci.yml

+11 −11
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ stages: 
.merge-request-comparison-check: &merge-request-comparison-check

  - echo "--------------- Running merge-request-comparison-check anchor ---------------"

  - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

  - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "Non-bitexact cases without non-BE tag encountered!"; exit $EXIT_CODE_FAIL; fi

  - if [ $exit_code -eq 1 ] && [ $non_be_flag != 0 ]; then echo "Non-bitexact cases with non-BE tag encountered"; exit $EXIT_CODE_NON_BE; fi

  - if [ $exit_code -ne 0 ] && [ $non_be_flag == 0 ]; then echo "Non-bitexact cases without non-BE tag encountered!"; exit $EXIT_CODE_FAIL; fi

  - if [ $exit_code -ne 0 ] && [ $non_be_flag != 0 ]; then echo "Non-bitexact cases with non-BE tag encountered"; exit $EXIT_CODE_NON_BE; fi

  - exit 0



.update-ltv-repo: &update-ltv-repo
@@ -673,9 +673,9 @@ pytest-compare-20ms-and-5ms-rendering: 
    - if [ $zero_errors5 != 1 ]; then echo "run error in with 5ms rendering encountered"; zero_errors=0 ; fi

    - if [ $zero_errors10 != 1 ]; then echo "run error in with 10ms rendering encountered"; zero_errors=0 ; fi

    - if [ $zero_errors != 1 ]; then exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code5 -eq 1 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi

    - if [ $exit_code10 -eq 1 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi

    - if [ $exit_code -eq 1 ]; then exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code5 -ne 0 ]; then echo "Non-bitexact cases encountered with 5ms rendering!"; exit_code=1; fi

    - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi

    - if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 1 week
@@ -821,7 +821,7 @@ renderer-pytest-on-merge-request: 
    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    # run test

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - *merge-request-comparison-check
@@ -1367,9 +1367,9 @@ codec-comparison-on-main-push: 
    ### run pytest

    - exit_code=0

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$?

    - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -ne 0 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true

    - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ]; then echo "pytest run had errors"; exit $EXIT_CODE_FAIL; fi;

  allow_failure:

    exit_codes:
@@ -1593,7 +1593,7 @@ ivas-conformance-linux: 
    - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"



    # Check for failures

    - if [ $exit_code -eq 1 ]; then echo "Test failures encountered"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -ne 0 ]; then echo "Test failures encountered"; exit $EXIT_CODE_FAIL; fi

    

  artifacts:

    name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"
@@ -1670,7 +1670,7 @@ test-long-self-test: 
    - zero_errors=$(cat report-junit-ltv.xml | grep -c 'errors="0"') || true



    - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -eq 1 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ]; then echo "Non-bitexact cases encountered!"; exit $EXIT_CODE_NON_BE; fi

    - exit 0
@@ -1735,7 +1735,7 @@ test-branch-vs-input-passthrough: 
    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true

    - python3 scripts/parse_xml_report.py report-junit.xml report.csv

    - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -eq 1 ]; then echo "Differences encountered."; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ]; then echo "Differences encountered."; exit $EXIT_CODE_NON_BE; fi

    - exit 0



  artifacts:

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
    <ClCompile Include="..\lib_util\masa_file_reader.c" />

    <ClCompile Include="..\lib_util\masa_file_writer.c" />

    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\obj_edit_file_reader.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />
@@ -146,6 +147,7 @@ 
    <ClInclude Include="..\lib_util\jbm_file_writer.h" />

    <ClInclude Include="..\lib_util\ls_custom_file_reader.h" />

    <ClInclude Include="..\lib_util\mime_io.h" />

    <ClInclude Include="..\lib_util\obj_edit_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_writer.h" />

    <ClInclude Include="..\lib_util\render_config_reader.h" />

Workspace_msvc/lib_util.vcxproj.filters

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 
    <ClCompile Include="..\lib_util\mime_io.c">

      <Filter>util_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_util\obj_edit_file_reader.c">

      <Filter>util_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_util\render_config_reader.c">

      <Filter>util_c</Filter>

    </ClCompile>
@@ -138,6 +141,9 @@ 
    <ClInclude Include="..\lib_util\mime_io.h">

      <Filter>util_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_util\obj_edit_file_reader.h">

      <Filter>util_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_util\render_config_reader.h">

      <Filter>util_h</Filter>

    </ClInclude>

apps/decoder.c

+189 −16
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 


#include "lib_dec.h"

#include <string.h>

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include <math.h>

#endif

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"
@@ -45,6 +48,9 @@ 
#include "rotation_file_reader.h"

#include "aeid_file_reader.h"

#include "split_render_file_read_write.h"

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include "obj_edit_file_reader.h"

#endif

#ifdef VARIABLE_SPEED_DECODING

#include "tsm_scale_file_reader.h"

#include <math.h>
@@ -151,6 +157,9 @@ typedef struct 
    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool objEditEnabled;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    char *objEditFileName;

#endif



} DecArguments;
@@ -179,16 +188,24 @@ typedef struct 


static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#endif

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );



#endif



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

 * main()
@@ -219,6 +236,9 @@ int main( 
    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader = NULL;

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -422,6 +442,20 @@ int main( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

     * Open object editing instruction file

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



    if ( arg.objEditFileName != NULL )

    {

        if ( ( error = ObjectEditFileReader_open( arg.objEditFileName, &objectEditFileReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Object editing instruction file %s \n\n", arg.objEditFileName );

            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -741,11 +775,19 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );

#else

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );

#endif

    }

    else

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );

#else

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -809,6 +851,9 @@ cleanup: 
    RotationFileReader_close( &refRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

    RenderConfigReader_close( &renderConfigReader );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader_close( &objectEditFileReader );

#endif



    if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )

    {
@@ -1007,6 +1052,9 @@ static bool parseCmdlIVAS_dec( 
    }



    arg->objEditEnabled = false;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

#endif



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

     * Initialization
@@ -1464,6 +1512,24 @@ static bool parseCmdlIVAS_dec( 
        {

            arg->objEditEnabled = true;

            i++;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

            if ( argc - i <= 3 || argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );

                usage_dec();

                return false;

            }



            if ( strcmp( argv[i], "NULL" ) == 0 || strcmp( argv[i], "null" ) == 0 )

            {

                arg->objEditFileName = NULL; /* use the built-in editing function */

            }

            else

            {

                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }

            i++;

#endif

        }



        /*-----------------------------------------------------------------*
@@ -1647,7 +1713,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" );

    fprintf( stdout, "-render_config File : Renderer configuration File\n" );

    fprintf( stdout, "-om File            : Metadata output File for BINAURAL_SPLIT_PCM OutputConf (only for Fs = 48 kHz)\n" );

    fprintf( stdout, "-non_diegetic_pan P : panning mono non-diegetic sound to stereo with paning P, -90<= P <=90,\n" );

    fprintf( stdout, "-non_diegetic_pan P : panning mono non-diegetic sound to stereo with panning P, -90<= P <=90,\n" );

    fprintf( stdout, "                      left or l or 90->left, right or r or -90->right, center or c or  0->middle\n" );

#ifdef DEBUGGING

    fprintf( stdout, "-FEC X              : Insert frame erasures, X = 0-10 is the percentage\n" );
@@ -1666,7 +1732,11 @@ static void usage_dec( void ) 
    fprintf( stdout, "-aeid ID | File     : Acoustic environment ID (number > 0)\n" );

    fprintf( stdout, "                      alternatively, it can be a text file where each line contains \"ID duration\"\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

#ifndef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    fprintf( stdout, "-obj_edit           : Enable objects editing\n" );

#else

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );

#endif

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );
@@ -1988,6 +2058,9 @@ static ivas_error decodeG192( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )
@@ -2385,8 +2458,23 @@ static ivas_error decodeG192( 
                        return error;

                    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    if ( arg.objEditFileName != NULL )

                    {

                        if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )

                        {

                            fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                            return error;

                        }

                    }

#endif



                    /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing( &editableParameters, objectEditFileReader );

#else

                    do_object_editing( &editableParameters );

#endif



                    /* set new object parameters */

                    if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -2909,6 +2997,9 @@ static ivas_error decodeVoIP( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    IVAS_DEC_HANDLE hIvasDec )

{

    bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */
@@ -3188,6 +3279,17 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )

        {

            if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                return error;

            }

        }

#endif



        /* read all packets with a receive time smaller than the system time */

        while ( nextPacketRcvTime_ms <= systemTime_ms )

        {
@@ -3288,7 +3390,11 @@ static ivas_error decodeVoIP( 
                }



                /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing( &editableParameters, objectEditFileReader );

#else

                do_object_editing( &editableParameters );

#endif



                /* set new object parameters */

                if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -3588,7 +3694,12 @@ cleanup: 
 *---------------------------------------------------------------------*/



static void do_object_editing(

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_EDITABLE_PARAMETERS *editableParameters,

    ObjectEditFileReader *objectEditFileReader )

#else

    IVAS_EDITABLE_PARAMETERS *editableParameters )

#endif

{

    /* put the objects equally spaced at the horizontal plane */

    /* and play a little bit with the gains... */
@@ -3604,6 +3715,66 @@ static void do_object_editing( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    if ( objectEditFileReader != NULL )

    {

        ReadObjectEditInfo *readInfo;

        readInfo = objectEditFileReader->readInfo;



        if ( readInfo->bg_gain_edited )

        {

            editableParameters->gain_bed = readInfo->bg_gain;

        }



        for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )

        {

            if ( !editableParameters->ism_metadata[obj_idx].non_diegetic_flag )

            {

                /* object direction editing only for diegetic objects */

                if ( readInfo->obj_azi_edited[obj_idx] )

                {

                    if ( readInfo->obj_azi_relative[obj_idx] )

                    {

                        /* azimuth: apply relative edit + wrap */

                        editableParameters->ism_metadata[obj_idx].azimuth = fmodf( editableParameters->ism_metadata[obj_idx].azimuth + readInfo->obj_azi[obj_idx] + 540.f, 360.f ) - 180.f;

                    }

                    else

                    {

                        editableParameters->ism_metadata[obj_idx].azimuth = readInfo->obj_azi[obj_idx];

                    }

                }

                if ( readInfo->obj_ele_edited[obj_idx] )

                {

                    if ( readInfo->obj_ele_relative[obj_idx] )

                    {

                        /* elevation: apply relative edit + saturation */

                        editableParameters->ism_metadata[obj_idx].elevation = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].elevation + readInfo->obj_ele[obj_idx], 90.f ), -90.f );

                    }

                    else

                    {

                        editableParameters->ism_metadata[obj_idx].elevation = readInfo->obj_ele[obj_idx];

                    }

                }

            }



            /* gain editing for all objects */

            if ( readInfo->obj_gain_edited[obj_idx] )

            {

                if ( readInfo->obj_gain_relative[obj_idx] )

                {

                    /* gain: apply relative edit + saturation */

                    editableParameters->ism_metadata[obj_idx].gain = fmaxf( fminf( editableParameters->ism_metadata[obj_idx].gain * readInfo->obj_gain[obj_idx], OBJ_EDIT_GAIN_MAX ), OBJ_EDIT_GAIN_MIN );

                }

                else

                {

                    editableParameters->ism_metadata[obj_idx].gain = readInfo->obj_gain[obj_idx];

                }

            }

        }

    }

    else

    {

#endif

        if ( num_nondiegetic_objects )

        {

            float start_angle, angle_inc;
@@ -3627,7 +3798,9 @@ static void do_object_editing( 
        }



        editableParameters->gain_bed = 0.5f;



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    }

#endif



    return;

}

ci/remove_unsupported_testcases.py

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ TESTCASES = [ 
    "MASA 1dir 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR custom configuration",

    "MASA 1dir 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration",

    "MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration",

    "MASA 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR custom configuration",

    "OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

]