Commit 5ac2ef7b authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1894-port-osba-fixes-basop-298-355-360_port_to_BASOP
parents 71e27ea4 04c6120f

lib_dec/jbm_jb4sb_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -419,10 +419,12 @@ JB4_DATAUNIT_HANDLE JB4_AllocDataUnit( 
        JB4_dropFromBuffer( h );

    }



    /* LOCK JBM MEMORY SLOT BEGIN */

    h->nFreeMemorySlots = (UWord16) L_sub( h->nFreeMemorySlots, 1 );

    move16();

    dataUnit = h->freeMemorySlots[h->nFreeMemorySlots];

    h->freeMemorySlots[h->nFreeMemorySlots] = NULL;

    /* LOCK JBM MEMORY SLOT END */

    assert( dataUnit != NULL );



    return dataUnit;
@@ -436,8 +438,10 @@ void JB4_FreeDataUnit( 
{

    assert( dataUnit != NULL );

    assert( h->nFreeMemorySlots < MAX_JBM_SLOTS );

    /* LOCK JBM MEMORY SLOT BEGIN */

    h->freeMemorySlots[h->nFreeMemorySlots] = dataUnit;

    h->nFreeMemorySlots = (UWord16) L_add( h->nFreeMemorySlots, 1 );

    /* LOCK JBM MEMORY SLOT END */

    move16();



    return;

lib_util/g192.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ G192_ERROR G192_WriteVoipFrame_short( 
    uint32_t ssrc = 0;

    uint16_t rtpSequenceNumber_2 = htons( rtpSequenceNumber );

    uint32_t rtpTimeStamp_2 = htonl( rtpTimeStamp );

    uint16_t ssrc_2 = (uint16_t) htonl( ssrc );

    uint32_t ssrc_2 = (uint32_t) htonl( ssrc );



    assert( numBits <= IVAS_MAX_BITS_PER_FRAME );

readme.txt

+19 −0
Original line number Diff line number Diff line
@@ -150,6 +150,25 @@ executables are "IVAS_cod.exe", "IVAS_dec.exe", "IVAS_rend.exe", and 
"ISAR_post_rend.exe". All reside in the c-code main directory. 







                       INTEGRATION AS LIBRARIES

                       ========================



While this package contains the necessary applications to execute the IVAS encoder,

decoder, renderer and ISAR post renderer, it is envisioned that the libraries used

would be integrated into custom applications.



It should be noted that this library is not thread-safe by default. Thus, when using

the IVAS libraries in a multi-threaded environment, proper synchronization of API

calls is required to prevent race conditions by concurrent access to IVAS internal

state memory, FIFO queues buffers or any other data structures. Potential mechanisms

include e.g. mutexes, spinlocks and semaphores. The API calls are at the present not

optimized for fine-granular locking of just critical sections. Some sensitive

sections have thus been marked with a comment in the form /* LOCK XYZ BEGIN */ and

/* LOCK XYZ END */ to provide guidance where code could be modified to prevent

some potential race conditions.





                       RUNNING THE SOFTWARE

                       ====================