Commit 17afddb8 authored by vaclav's avatar vaclav
Browse files

simplification + fix JBM object editing with file; under NONBE_FIX_1255_OBJ_EDIT_JBM

parent 1ea21c67

apps/decoder.c

+21 −26
Original line number Diff line number Diff line
@@ -3047,9 +3047,6 @@ static ivas_error decodeVoIP( 
    int16_t nOutSamples = 0;



    bool bitstreamReadDone = false;

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

    bool frameDecodedDone = false;

#endif



    bool parametersAvailableForEditing = false;

    uint16_t nSamplesRendered = 0;
@@ -3171,9 +3168,6 @@ static ivas_error decodeVoIP( 
    while ( 1 )

    {

        nSamplesRendered = 0;

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        frameDecodedDone = false;

#endif



        /* reference vector */

        if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )
@@ -3288,11 +3282,18 @@ static ivas_error decodeVoIP( 
#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

        {

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            if ( vec_pos_update == 0 )

            {

#endif

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

                {

                    fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                    return error;

                }

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            }

#endif

        }

#endif
@@ -3409,13 +3410,6 @@ static ivas_error decodeVoIP( 
                    return error;

                }

            }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            if ( parametersAvailableForEditing )

            {

                frameDecodedDone = true;

            }

#endif

        } /* while ( nSamplesRendered < nOutSamples ) */



        /* write JBM Offset file entry */
@@ -3536,16 +3530,6 @@ static ivas_error decodeVoIP( 
        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( frameDecodedDone == true )

        {

            if ( !arg.quietModeEnabled )

            {

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

            }



            frame++;

        }



        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#else

        if ( !arg.quietModeEnabled )
@@ -3560,6 +3544,17 @@ static ivas_error decodeVoIP( 
            systemTime_ms += vec_pos_len * systemTimeInc_ms;

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( vec_pos_update == 0 )

        {

            frame++;

            if ( !arg.quietModeEnabled )

            {

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

            }

        }

#endif



#ifdef WMOPS

        update_mem();

        update_wmops();