DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I56982f3e2f123684c2ba748da659c056f567ecb0
diff --git a/Android.bp b/Android.bp
index d74fb76..dafe520 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,7 @@
cc_library_static {
name: "libhevcdec",
vendor_available: true,
+ host_supported: true,
cflags: [
"-D_LIB",
@@ -397,3 +398,17 @@
blacklist: "cfi_blacklist.txt",
},
}
+
+cc_test {
+ name: "hevcdec",
+ cflags: [
+ "-DPROFILE_ENABLE",
+ "-DARM",
+ "-fPIC",
+ "-DMD5_DISABLE",
+ "-Wall",
+ "-Werror",
+ ],
+ srcs: ["test/decoder/main.c"],
+ static_libs: ["libhevcdec"],
+}
diff --git a/common/arm64/ihevc_itrans_recon_32x32.s b/common/arm64/ihevc_itrans_recon_32x32.s
index 51646ac..8f98503 100644
--- a/common/arm64/ihevc_itrans_recon_32x32.s
+++ b/common/arm64/ihevc_itrans_recon_32x32.s
@@ -141,9 +141,6 @@
.extern g_ai2_ihevc_trans_32_transpose
-x5_addr: .word 0xfffff000
-x9_addr: .word 0xffff0000
-
.type ihevc_itrans_recon_32x32_av8, %function
ihevc_itrans_recon_32x32_av8:
@@ -176,8 +173,8 @@
// x10,x9,x11,x12
mov x9,#0xffffff00
mov x10,#0xfffffff0
- ldr w5, x5_addr
- ldr w7, x9_addr
+ mov w5,#0xfffff000
+ mov w7,#0xffff0000
cmp x12,x10
mov x20,#1
csel x14, x20, x14,hs
@@ -1588,8 +1585,8 @@
// sub x0,x0,#512
mov x11,#0xfffffff0
mov x5, #0xffffff00
- ldr w6, x5_addr
- ldr w9, x9_addr
+ mov w6,#0xfffff000
+ mov w9,#0xffff0000
// sub x1,x1,#2048
mov x4,x1
mov x10,#240
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 7807003..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# decoder
-include $(LOCAL_PATH)/decoder.mk
diff --git a/test/decoder.mk b/test/decoder.mk
deleted file mode 100644
index 6b343a0..0000000
--- a/test/decoder.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := hevcdec
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := \
- -DPROFILE_ENABLE -DARM -fPIC -DMD5_DISABLE \
- -Wall -Werror
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/
-LOCAL_SRC_FILES := decoder/main.c
-LOCAL_STATIC_LIBRARIES := libhevcdec
-
-include $(BUILD_EXECUTABLE)
