Commit 02e21d6f authored by vaclav's avatar vaclav
Browse files

fix within FIX_FMSW_DEC

parent bab583d8

lib_util/ivas_rtp_file.c

+15 −8
Original line number Diff line number Diff line
@@ -1074,11 +1074,17 @@ ivas_error IVAS_RTP_ReadNextFrame( 
    else

    {

#ifdef FIX_FMSW_DEC

        if ( ( codecId != IVAS_RTP_UNDEF ) && ( ( rtp->codecId != codecId ) || ( codecId == IVAS_RTP_EVS && ( rtp->isAMRWB_IOmode != isAMRWB_IOmode ) ) ) )

        if ( rtp->codecId != IVAS_RTP_UNDEF && ( ( rtp->codecId != codecId ) || ( codecId == IVAS_RTP_EVS && rtp->isAMRWB_IOmode != isAMRWB_IOmode ) ) )

        {

            rtp->restartNeeded = true;



            fprintf( stdout, "\nRTP packet codec changed %s -> %s\n",

                     ( rtp->codecId == IVAS_RTP_EVS ) ? ( rtp->isAMRWB_IOmode ? "AMRWB_IO" : "EVS" ) : "IVAS",

                     ( codecId == IVAS_RTP_EVS ) ? ( isAMRWB_IOmode ? "AMRWB_IO" : "EVS" ) : "IVAS" );

        }

#else

        rtp->restartNeeded = ( rtp->codecId != codecId ) ||

                             ( codecId == IVAS_RTP_EVS && ( rtp->isAMRWB_IOmode != isAMRWB_IOmode ) );

#endif



        if ( rtp->restartNeeded )

        {
@@ -1086,6 +1092,7 @@ ivas_error IVAS_RTP_ReadNextFrame( 
                     ( rtp->codecId == IVAS_RTP_EVS ) ? ( rtp->isAMRWB_IOmode ? "AMRWB_IO" : "EVS" ) : "IVAS",

                     ( codecId == IVAS_RTP_EVS ) ? ( isAMRWB_IOmode ? "AMRWB_IO" : "EVS" ) : "IVAS" );

        }

#endif



        rtp->codecId = codecId;

        rtp->isAMRWB_IOmode = isAMRWB_IOmode;