Snap for 9550355 from 9fcdebef07c9f30dc8a64f9236078a4b1caaa8e1 to sdk-release
Change-Id: I63c1011d729f92d4ce2bee0e4188ea1399db9e53
diff --git a/Android.bp b/Android.bp
index 87203a0..f99ae5c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -148,6 +148,17 @@
],
},
+ riscv64: {
+ local_include_dirs: [
+ "common/riscv",
+ ],
+
+ srcs: [
+ "decoder/riscv/impeg2d_function_selector.c",
+ "common/riscv/ideint_function_selector.c",
+ ],
+ },
+
x86: {
cflags: [
"-DX86",
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9a8974d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,187 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ Copyright (c) 2015, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/common/icv.h b/common/icv.h
index 7ab4645..73f56e1 100644
--- a/common/icv.h
+++ b/common/icv.h
@@ -77,6 +77,7 @@
ICV_X86_AVX2,
ICV_MIPS_GENERIC = 0x2000,
ICV_MIPS_32,
+ ICV_RISCV_GENERIC = 0x3000,
}ICV_ARCH_T;
/** SOC Enumeration */
diff --git a/common/mips/icv_platform_macros.h b/common/riscv/icv_platform_macros.h
similarity index 68%
rename from common/mips/icv_platform_macros.h
rename to common/riscv/icv_platform_macros.h
index 61da7f5..4b268f6 100644
--- a/common/mips/icv_platform_macros.h
+++ b/common/riscv/icv_platform_macros.h
@@ -46,24 +46,6 @@
return 32;
}
-static __inline UWORD32 CLZNZ(UWORD32 u4_word)
-{
- ASSERT(u4_word);
- return(__builtin_clz(u4_word));
-}
-
-static __inline UWORD32 CTZ(UWORD32 u4_word)
-{
- if(0 == u4_word)
- return 31;
- else
- {
- unsigned int index;
- index = __builtin_ctz(u4_word);
- return (UWORD32)index;
- }
-}
-
#define CLIP_U8(x) CLIP3(0, 255, (x))
#define CLIP_S8(x) CLIP3(-128, 127, (x))
@@ -76,24 +58,8 @@
#define CLIP_U16(x) CLIP3(0, 65535, (x))
#define CLIP_S16(x) CLIP3(-32768, 32767, (x))
-#define ITT_BIG_ENDIAN(x) __builtin_bswap32(x);
-
#define NOP(nop_cnt) {UWORD32 nop_i; for (nop_i = 0; nop_i < nop_cnt; nop_i++) asm("nop");}
-#define PREFETCH(x) __builtin_prefetch(x);
-
-#define DATA_SYNC() __sync_synchronize()
-
-#define SHL(x,y) (((y) < 32) ? ((x) << (y)) : 0)
-#define SHR(x,y) (((y) < 32) ? ((x) >> (y)) : 0)
-
-#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)))
-
-
#endif /* _ICV_PLATFORM_MACROS_H_ */
diff --git a/common/mips/ideint_function_selector.c b/common/riscv/ideint_function_selector.c
similarity index 98%
rename from common/mips/ideint_function_selector.c
rename to common/riscv/ideint_function_selector.c
index 0e3ae70..9f2e4bd 100644
--- a/common/mips/ideint_function_selector.c
+++ b/common/riscv/ideint_function_selector.c
@@ -106,5 +106,5 @@
*/
ICV_ARCH_T ideint_default_arch(void)
{
- return ICV_MIPS_GENERIC;
+ return ICV_RISCV_GENERIC;
}
diff --git a/common/mips/impeg2_platform_macros.h b/common/riscv/impeg2_platform_macros.h
similarity index 98%
rename from common/mips/impeg2_platform_macros.h
rename to common/riscv/impeg2_platform_macros.h
index 183f1fa..a5912e2 100644
--- a/common/mips/impeg2_platform_macros.h
+++ b/common/riscv/impeg2_platform_macros.h
@@ -42,7 +42,6 @@
#define CLIP_U16(x) ((x) > 65535) ? (65535) : (((x) < 0) ? (0) : (x))
#define CLIP_S16(x) ((x) > 32767) ? (32767) : (((x) < -32768) ? (-32768) : (x))
-#define PLD(x)
#define INLINE
diff --git a/decoder/impeg2d_deinterlace.c b/decoder/impeg2d_deinterlace.c
index 89e5c1a..3787367 100644
--- a/decoder/impeg2d_deinterlace.c
+++ b/decoder/impeg2d_deinterlace.c
@@ -65,7 +65,8 @@
{ARCH_X86_SSE42, ICV_X86_SSE42},
{ARCH_X86_AVX2, ICV_X86_AVX2},
{ARCH_MIPS_GENERIC, ICV_MIPS_GENERIC},
- {ARCH_MIPS_32, ICV_MIPS_32}
+ {ARCH_MIPS_32, ICV_MIPS_32},
+ {ARCH_RISCV_GENERIC, ICV_RISCV_GENERIC},
};
diff --git a/decoder/ivd.h b/decoder/ivd.h
index abc6604..86f4376 100644
--- a/decoder/ivd.h
+++ b/decoder/ivd.h
@@ -69,7 +69,8 @@
ARCH_X86_SSE42,
ARCH_X86_AVX2,
ARCH_MIPS_GENERIC = 0x200,
- ARCH_MIPS_32
+ ARCH_MIPS_32,
+ ARCH_RISCV_GENERIC = 0x300,
}IVD_ARCH_T;
/* IVD_SOC_T: SOC Enumeration */
diff --git a/decoder/mips/impeg2d_function_selector.c b/decoder/riscv/impeg2d_function_selector.c
similarity index 97%
rename from decoder/mips/impeg2d_function_selector.c
rename to decoder/riscv/impeg2d_function_selector.c
index 3b2677a..780c736 100644
--- a/decoder/mips/impeg2d_function_selector.c
+++ b/decoder/riscv/impeg2d_function_selector.c
@@ -78,5 +78,5 @@
{
dec_state_t *ps_codec = (dec_state_t *)pv_codec;
- ps_codec->e_processor_arch = ARCH_NA;
+ ps_codec->e_processor_arch = ARCH_RISCV_GENERIC;
}
