Commit 968866d6 authored by bayers's avatar bayers
Browse files

fix JBM and initOnFirstGoodFrame again

parent f5a9dfdc

apps/decoder.c

+24 −17
Original line number Diff line number Diff line
@@ -1977,8 +1977,19 @@ static ivas_error initOnFirstGoodFrame( 
    }



#if defined( SPLIT_REND_WITH_HEAD_ROT ) && defined( API_5MS )

    if ( *hSplitRendFileReadWrite != NULL )

    {



        int16_t enable5ms;



        if ( numOutSamples == NULL || vec_pos_len == NULL )

        {

            return IVAS_ERR_UNEXPECTED_NULL_POINTER;

        }



        IVAS_DEC_Get5msFlag( hIvasDec, &enable5ms );



        /* real setting of the 5ms mode for split rendering is only known after the decoded first good frame, reset the variables needed in the main decoding loop accordingly here*/

        if ( enable5ms )

        {

            *numOutSamples = (int16_t) ( arg.output_Fs / 1000 * HEADROTATION_FETCH_FRAMESIZE_MS );
@@ -1989,7 +2000,7 @@ static ivas_error initOnFirstGoodFrame( 
            *numOutSamples = (int16_t) ( arg.output_Fs / 1000 * DEFAULT_FETCH_FRAMESIZE_MS );

            *vec_pos_len = 1;

        }



    }

#endif



    return IVAS_ERR_OK;
@@ -3642,18 +3653,14 @@ static ivas_error decodeVoIP( 
#ifdef SPLIT_REND_WITH_HEAD_ROT



                SplitFileReadWrite *hSplitRendFileReadWrite = NULL;

#endif

#if defined( SPLIT_REND_WITH_HEAD_ROT ) && defined( API_5MS )

                int16_t vec_pos_len;

                uint16_t nOutSamplesTmp;

#endif

                error = initOnFirstGoodFrame(

                    hIvasDec,

                    arg,

                    numInitialBadFrames,

#if defined( SPLIT_REND_WITH_HEAD_ROT ) && defined( API_5MS )

                    &nOutSamplesTmp,

                    &vec_pos_len,

                    &nOutSamples,

                    NULL,

#else

                    nOutSamples,

#endif