Commit 21344999 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Add missing part from IVAS_DEC_GetEditableParameters and adjust to be in line with float version.

parent 0cedd1ad

lib_dec/lib_dec_fx.c

+27 −0
Original line number Diff line number Diff line
@@ -4217,14 +4217,23 @@ ivas_error IVAS_DEC_GetEditableParameters( 
            hIvasEditableParameters->num_obj = 0;

            move16();

        }

#ifdef DEBUGGING

        ELSE

        {

            assert( 0 && "This should never happen!" );

        }

#endif

    }

#ifdef NONBE_1217_INIT_OBJ_EDIT

    ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) || ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) )

#else

    ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_32( ism_mode, ISM_MASA_MODE_DISC ) ) )

#endif

    {

        /* object editing possible only in two highest OMASA modes */

#ifdef NONBE_1217_INIT_OBJ_EDIT

        test();

#endif

        IF( EQ_32( ism_mode, ISM_MASA_MODE_DISC ) )

        {

            FOR( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
@@ -4249,7 +4258,11 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                move16();

            }

        }

#ifdef NONBE_1217_INIT_OBJ_EDIT

        ELSE IF ( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )

#else

        ELSE

#endif

        {

            /* Handle MONO output */

            IF( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )
@@ -4285,6 +4298,18 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                move16();

            }

        }

#ifdef NONBE_1217_INIT_OBJ_EDIT

        ELSE IF ( EQ_32( ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_32( ism_mode, ISM_MODE_NONE ) )

        {

            hIvasEditableParameters->num_obj = 0;

        }

#ifdef DEBUGGING

        ELSE

        {

            assert( 0 && "This should never happen!" );

        }

#endif

#endif

    }



    return IVAS_ERR_OK;
@@ -4440,10 +4465,12 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                return IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED;

            }

        }

#ifdef DEBUGGING

        ELSE

        {

            assert( 0 && "This should never happen!" );

        }

#endif

    }

    ELSE IF( EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_16( ism_mode, ISM_MASA_MODE_DISC ) ) )

    {