Commit 021397d2 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Remove hIvasDec pointers for g192 decoding, fix masa restart

parent 6f155ea3

apps/decoder.c

+0 −15
Original line number Diff line number Diff line
@@ -193,11 +193,7 @@ static ivas_error decodeG192( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifdef DECODER_FORMAT_SWITCHING

    IVAS_DEC_HANDLE *phIvasDec,

#else

    IVAS_DEC_HANDLE hIvasDec,

#endif

    int16_t *pcmBuf );

static ivas_error decodeVoIP(

    DecArguments arg,
@@ -798,11 +794,7 @@ int main( 
    }

    else

    {

#ifdef DECODER_FORMAT_SWITCHING

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );

#else

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -2257,11 +2249,7 @@ static ivas_error decodeG192( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifdef DECODER_FORMAT_SWITCHING

    IVAS_DEC_HANDLE *phIvasDec,

#else

    IVAS_DEC_HANDLE hIvasDec,

#endif

    int16_t *pcmBuf )



{
@@ -2298,9 +2286,6 @@ static ivas_error decodeG192( 
    int16_t vec_pos_update, vec_pos_len;

    SplitFileReadWrite *splitRendWriter = NULL;

    int16_t isSplitRend, isSplitCoded;

#ifdef DECODER_FORMAT_SWITCHING

    IVAS_DEC_HANDLE hIvasDec = *phIvasDec;

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )

lib_dec/ivas_init_dec.c

+12 −4
Original line number Diff line number Diff line
@@ -264,14 +264,16 @@ ivas_error ivas_dec_get_format( 
        }

        else if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifdef DECODER_FORMAT_SWITCHING

            uint8_t masaRestartCandidate = 0;

#endif

            /* read number of MASA transport channels */

            if ( st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 1] )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( st_ivas->nchan_transport == 1 && isVoipMode )

                {

                    st_ivas->restartNeeded = 1;

                    return IVAS_ERR_OK;

                    masaRestartCandidate = 1;

                }

#endif

                st_ivas->nchan_transport = 2;
@@ -282,8 +284,7 @@ ivas_error ivas_dec_get_format( 
#ifdef DECODER_FORMAT_SWITCHING

                if ( st_ivas->nchan_transport == 2 && isVoipMode )

                {

                    st_ivas->restartNeeded = 1;

                    return IVAS_ERR_OK;

                    masaRestartCandidate = 1;

                }

#endif

                st_ivas->nchan_transport = 1;
@@ -313,6 +314,13 @@ ivas_error ivas_dec_get_format( 
                st_ivas->nchan_transport = 2;

                element_mode_flag = 1;

            }

#ifdef DECODER_FORMAT_SWITCHING

            else if ( masaRestartCandidate > 0 )

            {

                st_ivas->restartNeeded = 1;

                return IVAS_ERR_OK;

            }

#endif



            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {