Commit 68297919 authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 2169 from float

parent 6f242bfb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
#define NONBE_FIX_1297_SPAR_JBM_MEM_SAN                 /* Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer */

#define NONBE_1303_GRANULARITY_OSBA_REND                /* VA: issue 1303: Correctly set the granularity in OSBA, Disc mode, and BINAURAL_ROOM_REVERB output */

#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */

#define FIX_1288_SPLIT_REND_XSAN                        /* Dlb: Fix asan, msan and usan issues in split rendering mode*/



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

lib_lc3plus/lc3.c

+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ static int null_in_list(void **list, int n) 
/* return pointer to aligned base + base_size, *base_size += size + 4 bytes align */

void *balloc(void *base, size_t *base_size, size_t size)

{

    uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & ~3;

    uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & (uintptr_t)(~3);

    assert((uintptr_t)base % 4 == 0); /* base must be 4-byte aligned */

    *base_size = (*base_size + size + 3) & ~3;

    *base_size = (*base_size + size + 3) & (uintptr_t)(~3);

    return (void *)ptr;

}