libmpeg2: remove unused INLINE macro
Bug: 261228395
Test: Build
diff --git a/common/arm/icv_platform_macros.h b/common/arm/icv_platform_macros.h
index db092a3..c25e00b 100644
--- a/common/arm/icv_platform_macros.h
+++ b/common/arm/icv_platform_macros.h
@@ -105,8 +105,6 @@
#define SHR_NEG(val,shift) (((shift) > 0) ? ( (val) >> (shift)) : ((val) << (-(shift))))
#define SHL_NEG(val,shift) (((shift) > 0) ? ( (val) >> (-(shift))) : ((val) << (shift)))
-#define INLINE inline
-
#define MEM_ALIGN8 __attribute__ ((aligned (8)))
#define MEM_ALIGN16 __attribute__ ((aligned (16)))
#define MEM_ALIGN32 __attribute__ ((aligned (32)))
diff --git a/common/arm/impeg2_platform_macros.h b/common/arm/impeg2_platform_macros.h
index 52b625d..8e1ff28 100644
--- a/common/arm/impeg2_platform_macros.h
+++ b/common/arm/impeg2_platform_macros.h
@@ -65,7 +65,6 @@
return x;
}
-#define INLINE
#define PLD(x) __pld(x)
#endif /* __IMPEG2_PLATFORM_MACROS_H__ */
diff --git a/common/armv8/icv_platform_macros.h b/common/armv8/icv_platform_macros.h
index 3602688..de3e6f4 100644
--- a/common/armv8/icv_platform_macros.h
+++ b/common/armv8/icv_platform_macros.h
@@ -38,9 +38,7 @@
#ifndef __ICV_PLATFORM_MACROS_H__
#define __ICV_PLATFORM_MACROS_H__
-#define INLINE inline
-
-static INLINE UWORD32 CLZ(UWORD32 u4_word)
+static __inline UWORD32 CLZ(UWORD32 u4_word)
{
if(u4_word)
return (__builtin_clz(u4_word));
@@ -83,8 +81,6 @@
#define SHR_NEG(val,shift) (((shift) > 0) ? ( (val) >> (shift)) : ((val) << (-(shift))))
#define SHL_NEG(val,shift) (((shift) > 0) ? ( (val) >> (-(shift))) : ((val) << (shift)))
-#define INLINE inline
-
#define MEM_ALIGN8 __attribute__ ((aligned (8)))
#define MEM_ALIGN16 __attribute__ ((aligned (16)))
#define MEM_ALIGN32 __attribute__ ((aligned (32)))
diff --git a/common/armv8/impeg2_platform_macros.h b/common/armv8/impeg2_platform_macros.h
index e3d1243..da0291c 100644
--- a/common/armv8/impeg2_platform_macros.h
+++ b/common/armv8/impeg2_platform_macros.h
@@ -39,7 +39,6 @@
#define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x))
#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x))
-#define INLINE
#define PLD(x) __pld(x)
#endif /* __IMPEG2_PLATFORM_MACROS_H__ */
diff --git a/common/riscv/icv_platform_macros.h b/common/riscv/icv_platform_macros.h
index 4b268f6..942464c 100644
--- a/common/riscv/icv_platform_macros.h
+++ b/common/riscv/icv_platform_macros.h
@@ -60,6 +60,4 @@
#define NOP(nop_cnt) {UWORD32 nop_i; for (nop_i = 0; nop_i < nop_cnt; nop_i++) asm("nop");}
-#define INLINE inline
-
#endif /* _ICV_PLATFORM_MACROS_H_ */
diff --git a/common/riscv/impeg2_platform_macros.h b/common/riscv/impeg2_platform_macros.h
index 9de0251..07af1a1 100644
--- a/common/riscv/impeg2_platform_macros.h
+++ b/common/riscv/impeg2_platform_macros.h
@@ -41,6 +41,4 @@
#define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x))
#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x))
-#define INLINE
-
#endif /* __IMPEG2_PLATFORM_MACROS_H__ */
diff --git a/common/x86/icv_platform_macros.h b/common/x86/icv_platform_macros.h
index 61da7f5..78b18d2 100644
--- a/common/x86/icv_platform_macros.h
+++ b/common/x86/icv_platform_macros.h
@@ -89,8 +89,6 @@
#define SHR_NEG(val,shift) (((shift) > 0) ? ( (val) >> (shift)) : ((val) << (-(shift))))
#define SHL_NEG(val,shift) (((shift) > 0) ? ( (val) >> (-(shift))) : ((val) << (shift)))
-#define INLINE inline
-
#define MEM_ALIGN8 __attribute__ ((aligned (8)))
#define MEM_ALIGN16 __attribute__ ((aligned (16)))
#define MEM_ALIGN32 __attribute__ ((aligned (32)))
diff --git a/common/x86/impeg2_platform_macros.h b/common/x86/impeg2_platform_macros.h
index 10dbdb2..e42dd35 100644
--- a/common/x86/impeg2_platform_macros.h
+++ b/common/x86/impeg2_platform_macros.h
@@ -42,6 +42,4 @@
#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x))
#define PLD(x)
-#define INLINE
-
#endif /* __IMPEG2_PLATFORM_MACROS_H__ */
diff --git a/decoder/impeg2d_bitstream.c b/decoder/impeg2d_bitstream.c
index 57a9e2f..b1690f7 100644
--- a/decoder/impeg2d_bitstream.c
+++ b/decoder/impeg2d_bitstream.c
@@ -144,7 +144,7 @@
*
* Values Returned : The bit read(0/1)
*******************************************************************************/
-INLINE UWORD8 impeg2d_bit_stream_get_bit(stream_t *ps_stream)
+UWORD8 impeg2d_bit_stream_get_bit(stream_t *ps_stream)
{
UWORD32 u4_bit,u4_offset,u4_temp;
UWORD32 u4_curr_bit;
@@ -188,7 +188,7 @@
*
* Values Returned : None
*******************************************************************************/
-INLINE void impeg2d_bit_stream_flush(void* pv_ctxt, UWORD32 u4_no_of_bits)
+void impeg2d_bit_stream_flush(void* pv_ctxt, UWORD32 u4_no_of_bits)
{
stream_t *ps_stream = (stream_t *)pv_ctxt;
@@ -219,7 +219,7 @@
* least significant bit and going towards most significant
* bit in the order of their occurence.
*******************************************************************************/
-INLINE void impeg2d_bit_stream_flush_to_byte_boundary(void* pv_ctxt)
+void impeg2d_bit_stream_flush_to_byte_boundary(void* pv_ctxt)
{
UWORD8 u1_bit_offset;
stream_t *ps_stream = (stream_t *)pv_ctxt;
@@ -257,7 +257,7 @@
* least significant bit and going towards most significant
* bit in the order of their occurence.
*******************************************************************************/
-INLINE UWORD32 impeg2d_bit_stream_nxt( stream_t *ps_stream, WORD32 i4_no_of_bits)
+UWORD32 impeg2d_bit_stream_nxt( stream_t *ps_stream, WORD32 i4_no_of_bits)
{
UWORD32 u4_bits,u4_offset,u4_temp;
UWORD8 u4_bit_ptr;
@@ -306,7 +306,7 @@
* bit in the order of their occurence.
*******************************************************************************/
-INLINE UWORD32 impeg2d_bit_stream_get(void* pv_ctxt, UWORD32 u4_num_bits)
+UWORD32 impeg2d_bit_stream_get(void* pv_ctxt, UWORD32 u4_num_bits)
{
UWORD32 u4_next_bits = impeg2d_bit_stream_nxt(pv_ctxt, u4_num_bits);
impeg2d_bit_stream_flush(pv_ctxt, u4_num_bits);
@@ -331,7 +331,7 @@
* least significant bit and going towards most significant
* bit in the order of their occurence.
*******************************************************************************/
-INLINE UWORD32 impeg2d_bit_stream_num_bits_read(void* pv_ctxt)
+UWORD32 impeg2d_bit_stream_num_bits_read(void* pv_ctxt)
{
stream_t *u4_no_of_bitsstream = (stream_t *)pv_ctxt;
size_t u4_temp;
diff --git a/decoder/impeg2d_bitstream.h b/decoder/impeg2d_bitstream.h
index 4ce4013..d4f9250 100644
--- a/decoder/impeg2d_bitstream.h
+++ b/decoder/impeg2d_bitstream.h
@@ -139,13 +139,13 @@
void impeg2d_bit_stream_init(stream_t *stream,
UWORD8 *byteBuf,
UWORD32 u4_max_offset);
-INLINE UWORD8 impeg2d_bit_stream_get_bit(stream_t *stream);
-INLINE void impeg2d_bit_stream_flush(void* ctxt, UWORD32 NoOfBits);
-INLINE void impeg2d_bit_stream_flush_to_byte_boundary(void* ctxt);
-INLINE UWORD32 impeg2d_bit_stream_nxt(stream_t *stream, WORD32 NoOfBits);
+UWORD8 impeg2d_bit_stream_get_bit(stream_t *stream);
+void impeg2d_bit_stream_flush(void* ctxt, UWORD32 NoOfBits);
+void impeg2d_bit_stream_flush_to_byte_boundary(void* ctxt);
+UWORD32 impeg2d_bit_stream_nxt(stream_t *stream, WORD32 NoOfBits);
-INLINE UWORD32 impeg2d_bit_stream_get(void* ctxt, UWORD32 numBits);
-INLINE UWORD32 impeg2d_bit_stream_num_bits_read(void* ctxt);
+UWORD32 impeg2d_bit_stream_get(void* ctxt, UWORD32 numBits);
+UWORD32 impeg2d_bit_stream_num_bits_read(void* ctxt);
diff --git a/decoder/impeg2d_mv_dec.c b/decoder/impeg2d_mv_dec.c
index 190726a..b64d994 100644
--- a/decoder/impeg2d_mv_dec.c
+++ b/decoder/impeg2d_mv_dec.c
@@ -60,7 +60,7 @@
*
* Value Returned: None
*******************************************************************************/
-INLINE void impeg2d_dec_1mv(stream_t *ps_stream, WORD16 ai2_pred_mv[], WORD16 ai2_mv[],UWORD16 au2_fCode[],
+void impeg2d_dec_1mv(stream_t *ps_stream, WORD16 ai2_pred_mv[], WORD16 ai2_mv[],UWORD16 au2_fCode[],
UWORD16 u2_mv_y_shift, WORD16 ai2_dmv[])
{
WORD16 i2_f;
diff --git a/decoder/impeg2d_mv_dec.h b/decoder/impeg2d_mv_dec.h
index f6c691e..44f0135 100644
--- a/decoder/impeg2d_mv_dec.h
+++ b/decoder/impeg2d_mv_dec.h
@@ -22,7 +22,7 @@
e_field_t impeg2d_dec_mv(stream_t *stream, WORD16 predMv[], WORD16 mv[],UWORD16 fCode[],
UWORD16 shift,UWORD16 fld_sel);
-INLINE void impeg2d_dec_1mv(stream_t *stream, WORD16 predMv[], WORD16 mv[],UWORD16 fCode[],
+void impeg2d_dec_1mv(stream_t *stream, WORD16 predMv[], WORD16 mv[],UWORD16 fCode[],
UWORD16 shift,WORD16 dmv[]);
#endif /* #ifndef __IMPEG2D_MV_DEC_H__ */
