Commit cab9c0e4 authored by advasila's avatar advasila
Browse files

OMASA EXT code review 2

parent fe7fb005

lib_dec/ivas_init_dec.c

+1 −7
Original line number Diff line number Diff line
@@ -400,14 +400,8 @@ ivas_error ivas_dec_setup( 
                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 */

                st_ivas->nchan_transport = 2;

                element_mode_flag = 1;



                /* ISM metadata */

                if ( st_ivas->hIsmMetaData[0] != NULL )

                {

                    /* these are not needed -> clean. EXT metafile writer in OMASA needs only the number of ISMs and writes default null-data */

                    ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );

                }

            }



#endif

            if ( st_ivas->ini_frame > 0 )

            {

lib_dec/ivas_masa_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -609,6 +609,14 @@ ivas_error ivas_masa_dec_open( 
    }



    ism_total_brate = 0;

#ifdef OMASA_EXT_OUTPUT

    /* ISM metadata */

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hIsmMetaData[0] != NULL && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

    {

        /* these are not needed -> clean. EXT metafile writer in OMASA needs only the number of ISMs and writes default null-data */

        ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );

    }

#endif

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->nSCE > 0 && ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) )

    {

        for ( i = 0; i < st_ivas->nSCE; i++ )