Commit cd13a1f6 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1255_OBJ_EDIT_JBM

parent 87956ac5

apps/decoder.c

+0 −15
Original line number Diff line number Diff line
@@ -3242,11 +3242,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 )

            {
@@ -3483,22 +3479,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++;
@@ -3507,7 +3493,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
@@ -168,7 +168,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_1262_OSBA_STEREO                      /* FhG: issue 1262: Fix missing scaling factor for OSBA stereo output */



/* ##################### End NON-BE switches ########################### */

lib_dec/lib_dec.c

+0 −11
Original line number Diff line number Diff line
@@ -3620,13 +3620,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
                hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;

                hIvasDec->nSamplesRendered = 0;

            }

#ifndef NONBE_FIX_1255_OBJ_EDIT_JBM

            if ( hIvasDec->hasBeenFedFirstGoodFrame )

            {

                *parametersAvailableForEditing = true;

                return IVAS_ERR_OK;

            }

#endif

        }



        /* decode */
@@ -3662,12 +3655,8 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
                    hIvasDec->nSamplesFlushed = nSamplesFlushed_ref;



                    *bitstreamReadDone = false;

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

                    *parametersAvailableForEditing = true;

                    return IVAS_ERR_OK;

#else



#endif

                }

            }