Commit 6aee1166 authored by vaclav's avatar vaclav
Browse files

code reduction within FIX_356_ISM_METADATA_SYNC

parent 041fa0da

lib_com/delay_comp.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -69,14 +69,15 @@ int32_t get_delay( 
        {

        {

            delay = IVAS_ENC_DELAY_NS;

            delay = IVAS_ENC_DELAY_NS;





            if ( ivas_format == MASA_FORMAT )

#ifdef FIX_356_ISM_METADATA_SYNC

            if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT )

            {

            {

                delay = 0; /* All delay is compensated in the decoder with MASA */

                delay = 0; /* All delay is compensated in the decoder with MASA/ISM */

            }

            }

#ifdef FIX_356_ISM_METADATA_SYNC

#else

            if (ivas_format == ISM_FORMAT)

            if ( ivas_format == MASA_FORMAT )

            {

            {

                delay = 0; /* All delay is compensated in the decoder with ISM */

                delay = 0; /* All delay is compensated in the decoder with MASA */

            }

            }

#endif

#endif

        }

        }
@@ -110,15 +111,15 @@ int32_t get_delay( 
                delay += IVAS_FB_DEC_DELAY_NS;

                delay += IVAS_FB_DEC_DELAY_NS;

            }

            }







#ifdef FIX_356_ISM_METADATA_SYNC

            if ( ivas_format == MASA_FORMAT )

            if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT )

            {

            {

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with ISM/MASA */

            }

            }

#ifdef FIX_356_ISM_METADATA_SYNC

#else

            if (ivas_format == ISM_FORMAT)

            if ( ivas_format == MASA_FORMAT )

            {

            {

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with ISM */

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */

            }

            }

#endif

#endif

        }

        }