Commit f2750d3d authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1217_INIT_OBJ_EDIT

parent b4b793f1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 
#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

#define OBJ_EDIT_BASOP

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

lib_dec/lib_dec_fx.c

+0 −30
Original line number Diff line number Diff line
@@ -4145,19 +4145,10 @@ ivas_error IVAS_DEC_GetEditableParameters( 
    test();

    test();

    test();

#ifdef NONBE_1217_INIT_OBJ_EDIT

    IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||

           EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ||

           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

    IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||

           ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_SBA_MODE_DISC ) ) ||

           ( 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 ) ) ) ) )

    {

        return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Object editing no supported in this operation mode." );

    }

#endif



    hIvasEditableParameters->gain_bed_fx = ONE_IN_Q29;

    move32();
@@ -4228,16 +4219,10 @@ ivas_error IVAS_DEC_GetEditableParameters( 
        }

#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++ )
@@ -4262,11 +4247,7 @@ 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 ) )
@@ -4302,7 +4283,6 @@ 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;
@@ -4313,7 +4293,6 @@ ivas_error IVAS_DEC_GetEditableParameters( 
        {

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

        }

#endif

#endif

    }
@@ -4355,19 +4334,10 @@ ivas_error IVAS_DEC_SetEditableParameters( 
    test();

    test();

    test();

#ifdef NONBE_1217_INIT_OBJ_EDIT

    IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||

           EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ||

           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

    test();

    test();

    IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||

           ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_SBA_MODE_DISC ) ) ||

           ( 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 ) ) ) ) ||

        EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

    {

        return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Object editing no supported in this operation mode." );

    }