Commit cbe5b74e authored by emerit's avatar emerit
Browse files

bug fix

parent 6462ce43

lib_com/ivas_ism_com.c

+5 −0
Original line number Diff line number Diff line
@@ -346,6 +346,9 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->yaw = 0.0f;

    hIsmMeta->pitch = 0.0f;

    hIsmMeta->radius = 1.0f;

#ifdef NON_DIEGETIC_PAN

    hIsmMeta->ism_metadata_flag = 1;

#endif



    return;

}
@@ -361,7 +364,9 @@ void ivas_ism_reset_metadata_API( 
    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)

{

#ifndef ivas_ism_reset_metadata

    hIsmMeta->ism_metadata_flag = 0;

#endif

    ivas_ism_reset_metadata( hIsmMeta );



    return;

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ ivas_error IVAS_DEC_Configure( 
    }



#ifdef NON_DIEGETIC_PAN

    if ( ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) && ( outputFormat != IVAS_DEC_OUTPUT_MONO ) && ( hIvasDec->st_ivas->hDecoderConfig->non_diegetic_pan ) )

    if ( ( hIvasDec->mode == IVAS_DEC_MODE_EVS ) && ( outputFormat != IVAS_DEC_OUTPUT_MONO ) && ( hIvasDec->st_ivas->hDecoderConfig->non_diegetic_pan == 0 ) )

    {

        return IVAS_ERR_WRONG_MODE;

    }

lib_enc/lib_enc.c

+6 −6
Original line number Diff line number Diff line
@@ -425,12 +425,12 @@ ivas_error IVAS_ENC_FeedObjectMetadata( 
        return IVAS_ERR_METADATA_NOT_EXPECTED;

    }



#ifdef ISM_NON_DIEGETIC_PAN

    if ( ( hIvasEnc->st_ivas->hEncoderConfig->ism_extended_metadata_flag == 0 ) && ( metadata.metadata_flag == 2 ) )

    {

        return IVAS_ERR_NON_DIEGETIC_PAN_METADATA_NOT_EXPECTED;

    }

#endif

    // #ifdef ISM_NON_DIEGETIC_PAN

    //     if ( ( hIvasEnc->st_ivas->hEncoderConfig->ism_extended_metadata_flag == 0 ) && ( metadata.metadata_flag == 2 ) )

    //     {

    //         return IVAS_ERR_NON_DIEGETIC_PAN_METADATA_NOT_EXPECTED;

    //     }

    // #endif



    if ( ismIndex > hIvasEnc->st_ivas->hEncoderConfig->nchan_inp )

    {

scripts/td_object_renderer/example_kit/md_2_non_diegetic_pan_left.csv

+2010 −2399

File changed.

Preview size limit exceeded, changes collapsed.

scripts/td_object_renderer/example_kit/md_2_non_diegetic_pan_left_mixed.csv

+2010 −1797

File changed.

Preview size limit exceeded, changes collapsed.