summaryrefslogtreecommitdiffstats
path: root/exynos/multimedia
diff options
context:
space:
mode:
authorSimon Shields <keepcalm444@gmail.com>2016-08-28 03:49:01 +1000
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-10-28 18:55:19 -0700
commit3c2325f13b982112900c367625276530df02015d (patch)
treeea0b130658967285bfa104bcaa9b292cb8c0c343 /exynos/multimedia
parentd4ee359c8d95cc1601671ef7f91979b6d4204748 (diff)
downloadhardware_samsung-3c2325f13b982112900c367625276530df02015d.tar.gz
hardware_samsung-3c2325f13b982112900c367625276530df02015d.tar.bz2
hardware_samsung-3c2325f13b982112900c367625276530df02015d.zip
exynos: multimedia: N/clang fixes
Change-Id: I1891f793a44465c28219cb19455dbc29c09d4868
Diffstat (limited to 'exynos/multimedia')
-rw-r--r--exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.c2
-rw-r--r--exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.h2
-rw-r--r--exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.c2
-rw-r--r--exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.h2
-rw-r--r--exynos/multimedia/utils/csc/exynos4/color_space_convertor.c1
-rw-r--r--exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_crop_neon.s16
-rw-r--r--exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_deinterleave_crop_neon.s16
7 files changed, 21 insertions, 20 deletions
diff --git a/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.c b/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.c
index 2a95b0e..6fc1ddc 100644
--- a/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.c
+++ b/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.c
@@ -48,7 +48,7 @@
#include "SEC_OSAL_Log.h"
-inline void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
+void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
{
SEC_OMX_BASECOMPONENT *pSECComponent = (SEC_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
SEC_OMX_BASEPORT *secInputPort = &pSECComponent->pSECPort[INPUT_PORT_INDEX];
diff --git a/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.h b/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.h
index 806ad44..f43c854 100644
--- a/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.h
+++ b/exynos/multimedia/openmax/component/video/dec/SEC_OMX_Vdec.h
@@ -144,7 +144,7 @@ OMX_ERRORTYPE SEC_OMX_VideoDecodeGetExtensionIndex(
OMX_ERRORTYPE SEC_OMX_VideoDecodeComponentInit(OMX_IN OMX_HANDLETYPE hComponent);
OMX_ERRORTYPE SEC_OMX_VideoDecodeComponentDeinit(OMX_IN OMX_HANDLETYPE hComponent);
OMX_BOOL SEC_Check_BufferProcess_State(SEC_OMX_BASECOMPONENT *pSECComponent);
-inline void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent);
+void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent);
#ifdef __cplusplus
}
diff --git a/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.c b/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.c
index cb1df5a..94ba5a4 100644
--- a/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.c
+++ b/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.c
@@ -48,7 +48,7 @@
#include "SEC_OSAL_Log.h"
-inline void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
+void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent)
{
SEC_OMX_BASECOMPONENT *pSECComponent = (SEC_OMX_BASECOMPONENT *)pOMXComponent->pComponentPrivate;
SEC_OMX_BASEPORT *secInputPort = &pSECComponent->pSECPort[INPUT_PORT_INDEX];
diff --git a/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.h b/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.h
index b16b372..7403544 100644
--- a/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.h
+++ b/exynos/multimedia/openmax/component/video/enc/SEC_OMX_Venc.h
@@ -154,7 +154,7 @@ OMX_ERRORTYPE SEC_OMX_VideoEncodeGetExtensionIndex(
OMX_ERRORTYPE SEC_OMX_VideoEncodeComponentInit(OMX_IN OMX_HANDLETYPE hComponent);
OMX_ERRORTYPE SEC_OMX_VideoEncodeComponentDeinit(OMX_IN OMX_HANDLETYPE hComponent);
OMX_BOOL SEC_Check_BufferProcess_State(SEC_OMX_BASECOMPONENT *pSECComponent);
-inline void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent);
+void SEC_UpdateFrameSize(OMX_COMPONENTTYPE *pOMXComponent);
#ifdef __cplusplus
}
diff --git a/exynos/multimedia/utils/csc/exynos4/color_space_convertor.c b/exynos/multimedia/utils/csc/exynos4/color_space_convertor.c
index 7a4c559..0385718 100644
--- a/exynos/multimedia/utils/csc/exynos4/color_space_convertor.c
+++ b/exynos/multimedia/utils/csc/exynos4/color_space_convertor.c
@@ -30,6 +30,7 @@
#include "stdio.h"
#include "stdlib.h"
+#include "string.h"
#include "color_space_convertor.h"
/*
diff --git a/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_crop_neon.s b/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_crop_neon.s
index da86ac6..a1468b5 100644
--- a/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_crop_neon.s
+++ b/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_crop_neon.s
@@ -166,10 +166,10 @@ LOOP_HEIGHT_256_GET_TILED_END:
pld [r12]
cmp r10, #0
pld [r12, #32]
- stmnefd sp!, {r9-r12, r14} @ backup registers
+ stmfdne sp!, {r9-r12, r14} @ backup registers
rsbne r10, r10, #64
blne MEMCOPY_UNDER_64
- ldmnefd sp!, {r9-r12, r14} @ restore registers
+ ldmfdne sp!, {r9-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_256_64
vld1.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset+temp1, 64}
vld1.8 {q2, q3}, [r11]
@@ -216,11 +216,11 @@ LOOP_HEIGHT_256_LEFT_192:
pld [r11, #32]
cmp r10, #0
pld [r12]
- stmnefd sp!, {r9-r12, r14} @ backup registers
+ stmfdne sp!, {r9-r12, r14} @ backup registers
pld [r12, #32]
rsbne r10, r10, #64
blne MEMCOPY_UNDER_64
- ldmnefd sp!, {r9-r12, r14} @ restore registers
+ ldmfdne sp!, {r9-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_192_64
vld1.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset+2048+temp1, 64}
vld1.8 {q2, q3}, [r11]
@@ -261,11 +261,11 @@ LOOP_HEIGHT_256_LEFT_128:
pld [r11, #32]
cmp r10, #0
pld [r12]
- stmnefd sp!, {r9-r12, r14} @ backup registers
+ stmfdne sp!, {r9-r12, r14} @ backup registers
pld [r12, #32]
rsbne r10, r10, #64
blne MEMCOPY_UNDER_64
- ldmnefd sp!, {r9-r12, r14} @ restore registers
+ ldmfdne sp!, {r9-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_128_64
vld1.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset1+temp1, 64}
vld1.8 {q2, q3}, [r11]
@@ -293,11 +293,11 @@ LOOP_HEIGHT_256_LEFT_64:
add r11, r11, r10
cmp r10, #0
pld [r11]
- stmnefd sp!, {r9-r12, r14} @ backup registers
+ stmfdne sp!, {r9-r12, r14} @ backup registers
pld [r11, #32]
rsbne r10, r10, #64
blne MEMCOPY_UNDER_64
- ldmnefd sp!, {r9-r12, r14} @ restore registers
+ ldmfdne sp!, {r9-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_64_64
vld1.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset1+temp1, 64}
vld1.8 {q2, q3}, [r11]
diff --git a/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_deinterleave_crop_neon.s b/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_deinterleave_crop_neon.s
index 45a749d..54911d3 100644
--- a/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_deinterleave_crop_neon.s
+++ b/exynos/multimedia/utils/csc/exynos4/csc_tiled_to_linear_deinterleave_crop_neon.s
@@ -170,10 +170,10 @@ LOOP_HEIGHT_256_GET_TILED_END:
pld [r12]
cmp r10, #0
pld [r12, #32]
- stmnefd sp!, {r8-r12, r14} @ backup registers
+ stmfd sp!, {r8-r12, r14} @ backup registers
rsbne r10, r10, #64
blne INTERLEAVED_MEMCOPY_UNDER_64
- ldmnefd sp!, {r8-r12, r14} @ restore registers
+ ldmfd sp!, {r8-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_256_64
vld2.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset+temp1, 64}
vld2.8 {q2, q3}, [r11]
@@ -232,11 +232,11 @@ LOOP_HEIGHT_256_LEFT_192:
pld [r11, #32]
cmp r10, #0
pld [r12]
- stmnefd sp!, {r8-r12, r14} @ backup registers
+ stmfd sp!, {r8-r12, r14} @ backup registers
pld [r12, #32]
rsbne r10, r10, #64
blne INTERLEAVED_MEMCOPY_UNDER_64
- ldmnefd sp!, {r8-r12, r14} @ restore registers
+ ldmfd sp!, {r8-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_192_64
vld2.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset+2048+temp1, 64}
vld2.8 {q2, q3}, [r11]
@@ -287,11 +287,11 @@ LOOP_HEIGHT_256_LEFT_128:
pld [r11, #32]
cmp r10, #0
pld [r12]
- stmnefd sp!, {r8-r12, r14} @ backup registers
+ stmfd sp!, {r8-r12, r14} @ backup registers
pld [r12, #32]
rsbne r10, r10, #64
blne INTERLEAVED_MEMCOPY_UNDER_64
- ldmnefd sp!, {r8-r12, r14} @ restore registers
+ ldmfd sp!, {r8-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_128_64
vld2.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset1+temp1, 64}
vld2.8 {q2, q3}, [r11]
@@ -327,11 +327,11 @@ LOOP_HEIGHT_256_LEFT_64:
add r11, r11, r10
cmp r10, #0
pld [r11]
- stmnefd sp!, {r8-r12, r14} @ backup registers
+ stmfd sp!, {r8-r12, r14} @ backup registers
pld [r11, #32]
rsbne r10, r10, #64
blne INTERLEAVED_MEMCOPY_UNDER_64
- ldmnefd sp!, {r8-r12, r14} @ restore registers
+ ldmfd sp!, {r8-r12, r14} @ restore registers
bne LOOP_HEIGHT_256_LEFT_64_64
vld2.8 {q0, q1}, [r11]! @ load {nv12t_src+tiled_offset1+temp1, 64}
vld2.8 {q2, q3}, [r11]