Commit b60d94b3 authored by lintervo's avatar lintervo
Browse files

Merge branch 'main' into 1680_basop_port_object_editing_implementation

parents 49876f5d 4707ded0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */

#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

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



// object-editing feature porting

#define OBJ_EDITING_INTERFACE                           /* Interface for object editing */

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;

}