Commit 9b4ecff5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1255_OBJ_EDIT_JBM

parent fa8a39a7

apps/decoder.c

+0 −15
Original line number Diff line number Diff line
@@ -3365,11 +3365,7 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

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

#else

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

#endif

        {

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

            {
@@ -3612,22 +3608,12 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#else

        if ( !arg.quietModeEnabled )

        {

            fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

        }

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        frame++;

#endif

        if ( vec_pos_update == 0 )

        {

            systemTime_ms += vec_pos_len * systemTimeInc_ms;

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( vec_pos_update == 0 )

        {

            frame++;
@@ -3636,7 +3622,6 @@ static ivas_error decodeVoIP( 
                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

            }

        }

#endif



#ifdef WMOPS

        update_mem();

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ 
#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

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

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */

#define NONBE_FIX_1172_OBJ_EDIT_JBM                     /* VA: issue 1172: fix OMASA object editing in JBM */

lib_dec/lib_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -4066,13 +4066,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
                hIvasDec->nSamplesRendered = 0;

#endif

            }

#ifndef NONBE_FIX_1255_OBJ_EDIT_JBM

            if ( hIvasDec->hasBeenFedFirstGoodFrame )

            {

                *parametersAvailableForEditing = true;

                return IVAS_ERR_OK;

            }

#endif

        }



        /* decode */
@@ -4110,10 +4103,8 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
                    hIvasDec->nSamplesFlushed = nSamplesFlushed_ref;

#endif

                    *bitstreamReadDone = false;

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

                    *parametersAvailableForEditing = true;

                    return IVAS_ERR_OK;

#endif

                }

            }