Clean up naming of VP9 support functions.
Change-Id: Ibfa931f3fb3a2ed2649733b7d7e679c0091dda90
diff --git a/scriptc/rs_core.rsh b/scriptc/rs_core.rsh
index 9ff0190..0d3642e 100644
--- a/scriptc/rs_core.rsh
+++ b/scriptc/rs_core.rsh
@@ -60,11 +60,6 @@
#include "rs_quaternion.rsh"
#include "rs_sampler.rsh"
#include "rs_time.rsh"
-#include "rs_idct.rsh"
-#include "rs_dct.rsh"
-#include "rs_iadst.rsh"
-#include "rs_fadst.rsh"
-#include "rs_walsh.rsh"
/**
* Send a message back to the client. Will not block and returns true
diff --git a/scriptc/rs_dct.rsh b/scriptc/rs_dct.rsh
index 51e789d..d7289dd 100644
--- a/scriptc/rs_dct.rsh
+++ b/scriptc/rs_dct.rsh
@@ -3,11 +3,11 @@
#if RS_VERSION > 19
-extern void dct4x4(rs_allocation input, rs_allocation output, int xoff, int yoff);
-extern void dct8x8(rs_allocation input, rs_allocation output, int xoff, int yoff);
-extern void dct16x16(rs_allocation input, rs_allocation output, int xoff, int yoff);
-extern void dct32x32(rs_allocation input, rs_allocation out, int xoff, int yoff);
-extern void dct32x32_rd(rs_allocation input, rs_allocation out, int xoff, int yoff);
+extern void rsDct4x4(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct8x8(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct16x16(rs_allocation input, rs_allocation output, int xoff, int yoff);
+extern void rsDct32x32(rs_allocation input, rs_allocation out, int xoff, int yoff);
+extern void rsDct32x32_rd(rs_allocation input, rs_allocation out, int xoff, int yoff);
#endif
diff --git a/scriptc/rs_fadst.rsh b/scriptc/rs_fadst.rsh
index 6dc0170..1dfe58f 100644
--- a/scriptc/rs_fadst.rsh
+++ b/scriptc/rs_fadst.rsh
@@ -3,11 +3,11 @@
#if RS_VERSION > 19
-extern void fadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsFadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
-extern void fadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsFadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
-extern void fadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsFadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
#endif
diff --git a/scriptc/rs_iadst.rsh b/scriptc/rs_iadst.rsh
index dad396c..3208814 100644
--- a/scriptc/rs_iadst.rsh
+++ b/scriptc/rs_iadst.rsh
@@ -3,11 +3,11 @@
#if RS_VERSION > 19
-extern void iadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsIadst4(const rs_allocation input, rs_allocation output, int32_t xoff);
-extern void iadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsIadst8(const rs_allocation input, rs_allocation output, int32_t xoff);
-extern void iadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
+extern void rsIadst16(const rs_allocation input, rs_allocation output, int32_t xoff);
#endif
diff --git a/scriptc/rs_idct.rsh b/scriptc/rs_idct.rsh
index e379736..d602e34 100644
--- a/scriptc/rs_idct.rsh
+++ b/scriptc/rs_idct.rsh
@@ -3,10 +3,10 @@
#if RS_VERSION > 19
-extern void idct4x4(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
-extern void idct8x8(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
-extern void idct16x16(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
-extern void idct32x32(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct4x4(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct8x8(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct16x16(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
+extern void rsIdct32x32(const rs_allocation input, rs_allocation dest, int eob, int xoff, int yoff);
#endif
diff --git a/scriptc/rs_vp9.rsh b/scriptc/rs_vp9.rsh
new file mode 100644
index 0000000..52fbe81
--- /dev/null
+++ b/scriptc/rs_vp9.rsh
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
+
+#ifndef __RS_VP9_RSH__
+#define __RS_VP9_RSH__
+
+
+#include "rs_idct.rsh"
+#include "rs_dct.rsh"
+#include "rs_iadst.rsh"
+#include "rs_fadst.rsh"
+#include "rs_walsh.rsh"
+
+#endif
+
diff --git a/scriptc/rs_walsh.rsh b/scriptc/rs_walsh.rsh
index de058ce..6f7445d 100644
--- a/scriptc/rs_walsh.rsh
+++ b/scriptc/rs_walsh.rsh
@@ -3,8 +3,8 @@
#if RS_VERSION > 19
-extern void walsh4x4(rs_allocation input, rs_allocation dest, int xoff, int yoff);
-extern void walsh4x4_1(rs_allocation input, rs_allocation dest, int xoff, int yoff);
+extern void rsWalsh4x4(rs_allocation input, rs_allocation dest, int xoff, int yoff);
+extern void rsWalsh4x4_1(rs_allocation input, rs_allocation dest, int xoff, int yoff);
#endif