Commit e4d04de8 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into lib_dec_revision

parents 1a6ccd7d ec44f31f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ ltv-usan: 
    - ivas-linux-fast

  artifacts:

    name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"

    expire_in: 4 weeks

    expire_in: 7 weeks

    when: always

    paths:

      - ep_015.g192

lib_dec/lib_dec.c

+5 −12
Original line number Diff line number Diff line
@@ -1967,14 +1967,14 @@ ivas_error IVAS_DEC_GetSamplesRenderer( 
    {

        hIvasDec->hasBeenFedFrame = false;

        set_s( pcmBuf, 0, st_ivas->hDecoderConfig->nchan_out * nSamplesAsked );

#ifdef LIB_DEC_REVISION

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

        nSamplesRendered = nSamplesAsked;

#else

        hIvasDec->nSamplesRendered += nSamplesAsked;

        *nOutSamples = nSamplesAsked;

#endif

        hIvasDec->nSamplesAvailableNext -= nSamplesAsked;

#ifndef LIB_DEC_REVISION

#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST

        if ( hIvasDec->nSamplesAvailableNext == 0 )

        {

            hIvasDec->needNewFrame = true;
@@ -2043,7 +2043,7 @@ ivas_error IVAS_DEC_GetSamplesRenderer( 
        }



        nSamplesRendered += nSamplesRendered_loop;

#ifndef LIB_DEC_REVISION

#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST

        nSamplesToRender -= nSamplesRendered_loop;

        if ( hIvasDec->nSamplesAvailableNext == 0 )

        {
@@ -2054,13 +2054,10 @@ ivas_error IVAS_DEC_GetSamplesRenderer( 
        {

            *needNewFrame = false;

        }

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

        *nOutSamples = nSamplesRendered;

#endif

#endif

    }



#ifdef LIB_DEC_REVISION

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

    if ( hIvasDec->nSamplesAvailableNext == 0 )

    {

        *needNewFrame = true;
@@ -2071,12 +2068,8 @@ ivas_error IVAS_DEC_GetSamplesRenderer( 
        *needNewFrame = false;

    }



    *nOutSamples = nSamplesRendered;

#else

#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST

    *nOutSamples = nSamplesRendered;

#endif

#endif

    *nOutSamples = nSamplesRendered;



    return IVAS_ERR_OK;

}

tests/test_26444.py

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ def test_evs_26444( 
            output_differs, reason = cmp_pcm(

                reffile,

                testfile,

                output_config,

                1,

                fs,

                get_mld=get_mld,

                mld_lim=get_mld_lim,