Commit a32b39e3 authored by vaclav's avatar vaclav
Browse files

issue 1255: restore object editing in JBM; under NONBE_FIX_1255_OBJ_EDIT_JBM

parent 783c4431

apps/decoder.c

+3 −3
Original line number Diff line number Diff line
@@ -3048,7 +3048,7 @@ static ivas_error decodeVoIP( 


    bool bitstreamReadDone = false;



    bool parameterAvailableForEditing = false;

    bool parametersAvailableForEditing = false;

    uint16_t nSamplesRendered = 0;



    vec_pos_update = 0;
@@ -3344,7 +3344,7 @@ static ivas_error decodeVoIP( 
        while ( nSamplesRendered < nOutSamples )

        {

#ifdef SUPPORT_JBM_TRACEFILE

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#endif
@@ -3378,7 +3378,7 @@ static ivas_error decodeVoIP( 
            }



            /* Object metadata editing */

            if ( arg.objEditEnabled && parameterAvailableForEditing == true )

            if ( arg.objEditEnabled && parametersAvailableForEditing == true )

            {

                IVAS_EDITABLE_PARAMETERS editableParameters;

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ 
#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */



#define NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP        /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; this is the fix in floating point */

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



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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/lib_dec.c

+8 −1
Original line number Diff line number Diff line
@@ -3955,12 +3955,13 @@ 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 */
@@ -3996,6 +3997,12 @@ 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

                }

            }