tremor: remove
Now that Tremor isn't enabled by default in oe-core's GStreamer plugins and has been added to meta-multimedia, it can be removed from oe-core. (From OE-Core rev: 30f5c80943f69884b3d7323b540c8bb0f1efd8fd) (From OE-Core rev: a8b476e7d6a5bf43cceb8c7b2610c9b66fe2f33e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
Richard Purdie
parent
9a1ac06139
commit
d16219b754
|
|
@ -1,15 +0,0 @@
|
|||
Upstream-Status: Submitted [https://trac.xiph.org/ticket/1922]
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (revision 18764)
|
||||
+++ configure.in (working copy)
|
||||
@@ -9,7 +9,7 @@
|
||||
AC_CANONICAL_HOST
|
||||
AC_CANONICAL_TARGET
|
||||
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AM_INIT_AUTOMAKE(libvorbisidec,1.2.1)
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
From: Xin Ouyang <Xin.Ouyang@windriver.com>
|
||||
Date: Mon, 16 Jul 2012 13:29:34 +0800
|
||||
Subject: [PATCH] tremor: add IT instructions for arm thumb2 tune flags.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
In Thumb-2, most instructions do not have a built in condition code (except for
|
||||
conditional branches). Instead, short sequences of instructions which are to be
|
||||
executed conditionally can be preceded by a special "IT instruction" which
|
||||
describes the condition and which of the following instructions should be
|
||||
executed if the condition is false respectively.
|
||||
|
||||
For the ARM/Thumb IT(If-Then) instruction:
|
||||
http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0489c/Cjabicci.html
|
||||
|
||||
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
|
||||
---
|
||||
asm_arm.h | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/asm_arm.h b/asm_arm.h
|
||||
index c3bda00..823c54f 100755
|
||||
--- a/asm_arm.h
|
||||
+++ b/asm_arm.h
|
||||
@@ -108,9 +108,11 @@ static inline void XNPROD31(ogg_int32_t a, ogg_int32_t b,
|
||||
static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
|
||||
int tmp;
|
||||
asm volatile("subs %1, %0, #32768\n\t"
|
||||
+ "itt pl\n\t"
|
||||
"movpl %0, #0x7f00\n\t"
|
||||
"orrpl %0, %0, #0xff\n"
|
||||
"adds %1, %0, #32768\n\t"
|
||||
+ "it mi\n\t"
|
||||
"movmi %0, #0x8000"
|
||||
: "+r"(x),"=r"(tmp)
|
||||
:
|
||||
@@ -139,10 +141,12 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
|
||||
|
||||
"ldmdb r0!,{r1,r3};"
|
||||
"subs r1,r1,%4;" //ilsp[j]-wi
|
||||
+ "it mi;"
|
||||
"rsbmi r1,r1,#0;" //labs(ilsp[j]-wi)
|
||||
"umull %0,r2,r1,%0;" //qi*=labs(ilsp[j]-wi)
|
||||
|
||||
"subs r1,r3,%4;" //ilsp[j+1]-wi
|
||||
+ "it mi;"
|
||||
"rsbmi r1,r1,#0;" //labs(ilsp[j+1]-wi)
|
||||
"umull %1,r3,r1,%1;" //pi*=labs(ilsp[j+1]-wi)
|
||||
|
||||
@@ -167,6 +171,7 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
|
||||
"mov r0,#0x4000;\n"
|
||||
|
||||
"subs r1,r1,%4;\n" //ilsp[j]-wi
|
||||
+ "it mi;\n"
|
||||
"rsbmi r1,r1,#0;\n" //labs(ilsp[j]-wi)
|
||||
"umull %0,r2,r1,%0;\n" //qi*=labs(ilsp[j]-wi)
|
||||
"umull %1,r3,r0,%1;\n" //pi*=labs(ilsp[j+1]-wi)
|
||||
@@ -190,18 +195,23 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
|
||||
"mov r2,#0;"
|
||||
"orr r1,%0,%1;"
|
||||
"tst r1,#0xff000000;"
|
||||
+ "itt ne;"
|
||||
"addne r2,r2,#8;"
|
||||
"movne r1,r1,lsr #8;"
|
||||
"tst r1,#0x00f00000;"
|
||||
+ "itt ne;"
|
||||
"addne r2,r2,#4;"
|
||||
"movne r1,r1,lsr #4;"
|
||||
"tst r1,#0x000c0000;"
|
||||
+ "itt ne;"
|
||||
"addne r2,r2,#2;"
|
||||
"movne r1,r1,lsr #2;"
|
||||
"tst r1,#0x00020000;"
|
||||
+ "itt ne;"
|
||||
"addne r2,r2,#1;"
|
||||
"movne r1,r1,lsr #1;"
|
||||
"tst r1,#0x00010000;"
|
||||
+ "it ne;"
|
||||
"addne r2,r2,#1;"
|
||||
"mov %0,%0,lsr r2;"
|
||||
"mov %1,%1,lsr r2;"
|
||||
@@ -222,15 +232,19 @@ static inline void lsp_norm_asm(ogg_uint32_t *qip,ogg_int32_t *qexpp){
|
||||
ogg_int32_t qexp=*qexpp;
|
||||
|
||||
asm("tst %0,#0x0000ff00;"
|
||||
+ "itt eq;"
|
||||
"moveq %0,%0,lsl #8;"
|
||||
"subeq %1,%1,#8;"
|
||||
"tst %0,#0x0000f000;"
|
||||
+ "itt eq;"
|
||||
"moveq %0,%0,lsl #4;"
|
||||
"subeq %1,%1,#4;"
|
||||
"tst %0,#0x0000c000;"
|
||||
+ "itt eq;"
|
||||
"moveq %0,%0,lsl #2;"
|
||||
"subeq %1,%1,#2;"
|
||||
"tst %0,#0x00008000;"
|
||||
+ "itt eq;"
|
||||
"moveq %0,%0,lsl #1;"
|
||||
"subeq %1,%1,#1;"
|
||||
: "+r"(qi),"+r"(qexp)
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
SUMMARY = "Fixed-point decoder"
|
||||
DESCRIPTION = "tremor is a fixed point implementation of the vorbis codec."
|
||||
SECTION = "libs"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \
|
||||
file://os.h;beginline=3;endline=14;md5=5c0af5e1bedef3ce8178c89f48cd6f1f"
|
||||
DEPENDS = "libogg"
|
||||
SRCDATE = "${PV}"
|
||||
PR = "r1"
|
||||
|
||||
# SVN support for upstream version check isn't implemented yet
|
||||
RECIPE_UPSTREAM_VERSION = "20150107"
|
||||
RECIPE_UPSTREAM_DATE = "Jan 07, 2015"
|
||||
CHECK_DATE = "Aug 12, 2015"
|
||||
|
||||
# Only subversion url left in OE-Core, use a mirror tarball instead since
|
||||
# this rarely changes.
|
||||
# svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http
|
||||
SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/Tremor_svn.xiph.org_.trunk_19427_.tar.gz \
|
||||
file://obsolete_automake_macros.patch;striplevel=0 \
|
||||
file://tremor-arm-thumb2.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "b308f9598176c0b5059c0124ab122afe"
|
||||
SRC_URI[sha256sum] = "2196802e1635f9ac4474eeee0fe4da12e6c1ad3942862427a67268de2b65b1d4"
|
||||
|
||||
S = "${WORKDIR}/Tremor"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--enable-shared"
|
||||
|
||||
ARM_INSTRUCTION_SET = "arm"
|
||||
Loading…
Reference in New Issue