op_videofir.sh: Changed filters to use one file per filter. Also include

a filter description in filter-files

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 4a59817..b4feab2 100644 (file)
--- a/recipes/pandora-system/pandora-scripts.bb
+++ b/recipes/pandora-system/pandora-scripts.bb
@@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 DEPENDS = "zenity dbus"
 RDEPENDS = "zenity dbus"
 
-PR = "r43"
+PR = "r44"
 
 SRC_URI = " \
           file://op_bright.sh \
@@ -46,12 +46,8 @@ SRC_URI = " \
           file://gui.conf \
           file://gamma.conf \
           file://service.conf \
-          file://default_up_h \
-          file://default_up_v3 \
-          file://default_up_v5 \
-          file://none_up_h \
-          file://none_up_v3 \
-          file://none_up_v5 \
+          file://default_up \
+          file://none_up \
           file://op_env.sh \
 #          file://pandorascripts.pnd \
          file://abiword.pnd \
@@ -137,12 +133,8 @@ do_install() {
           install -m 0644 ${WORKDIR}/service.conf ${D}${sysconfdir}/pandora/conf/service.conf
 
           install -d ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_h ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_v3 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/default_up_v5 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_h ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_v3 ${D}${sysconfdir}/pandora/conf/dss_fir/
-          install -m 0644 ${WORKDIR}/none_up_v5 ${D}${sysconfdir}/pandora/conf/dss_fir/
+          install -m 0644 ${WORKDIR}/default_up ${D}${sysconfdir}/pandora/conf/dss_fir/
+          install -m 0644 ${WORKDIR}/none_up ${D}${sysconfdir}/pandora/conf/dss_fir/
 
           install -d ${D}${sysconfdir}/profile.d/
           install -m 0755 ${WORKDIR}/op_env.sh ${D}${sysconfdir}/profile.d/

diff --git a/recipes/pandora-system/pandora-scripts/default b/recipes/pandora-system/pandora-scripts/default
new file mode 100644 (file)
index 0000000..8976137
--- /dev/null
+++ b/recipes/pandora-system/pandora-scripts/default
@@ -0,0 +1,29 @@
+Default (Slightly blurred)
+#up_h
+  0   0 128   0   0
+ -1  13 124  -8   0
+ -2  30 112 -11  -1
+ -5  51  95 -11  -2
+  0  -9  73  73  -9
+ -2 -11  95  51  -5
+ -1 -11 112  30  -2
+  0  -8 124  13  -1
+#up_v3
+  0   0 128   0   0
+  0   3 123   2   0
+  0  12 111   5   0
+  0  32  89   7   0
+  0   0  64  64   0
+  0   7  89  32   0
+  0   5 111  12   0
+  0   2 123   3   0
+#up_v5
+  0   0 128   0   0
+ -1  13 124  -8   0
+ -2  30 112 -11  -1
+ -5  51  95 -11  -2
+  0  -9  73  73  -9
+ -2 -11  95  51  -5
+ -1 -11 112  30  -2
+  0  -8 124  13  -1
+ 

diff --git a/recipes/pandora-system/pandora-scripts/default_up_h b/recipes/pandora-system/pandora-scripts/default_up_h
deleted file mode 100644 (file)
index 2a24a48..0000000
--- a/recipes/pandora-system/pandora-scripts/default_up_h
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
- -1  13 124  -8   0
- -2  30 112 -11  -1
- -5  51  95 -11  -2
-  0  -9  73  73  -9
- -2 -11  95  51  -5
- -1 -11 112  30  -2
-  0  -8 124  13  -1

diff --git a/recipes/pandora-system/pandora-scripts/default_up_v3 b/recipes/pandora-system/pandora-scripts/default_up_v3
deleted file mode 100644 (file)
index 404a42a..0000000
--- a/recipes/pandora-system/pandora-scripts/default_up_v3
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
-  0   3 123   2   0
-  0  12 111   5   0
-  0  32  89   7   0
-  0   0  64  64   0
-  0   7  89  32   0
-  0   5 111  12   0
-  0   2 123   3   0

diff --git a/recipes/pandora-system/pandora-scripts/default_up_v5 b/recipes/pandora-system/pandora-scripts/default_up_v5
deleted file mode 100644 (file)
index 2a24a48..0000000
--- a/recipes/pandora-system/pandora-scripts/default_up_v5
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
- -1  13 124  -8   0
- -2  30 112 -11  -1
- -5  51  95 -11  -2
-  0  -9  73  73  -9
- -2 -11  95  51  -5
- -1 -11 112  30  -2
-  0  -8 124  13  -1

diff --git a/recipes/pandora-system/pandora-scripts/none b/recipes/pandora-system/pandora-scripts/none
new file mode 100644 (file)
index 0000000..2186d9c
--- /dev/null
+++ b/recipes/pandora-system/pandora-scripts/none
@@ -0,0 +1,28 @@
+Simple pixel doubling (no filter)
+#up_h
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+#up_v3
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+#up_v5
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0
+  0   0 128   0   0

diff --git a/recipes/pandora-system/pandora-scripts/none_up_h b/recipes/pandora-system/pandora-scripts/none_up_h
deleted file mode 100644 (file)
index 3731355..0000000
--- a/recipes/pandora-system/pandora-scripts/none_up_h
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0

diff --git a/recipes/pandora-system/pandora-scripts/none_up_v3 b/recipes/pandora-system/pandora-scripts/none_up_v3
deleted file mode 100644 (file)
index 3731355..0000000
--- a/recipes/pandora-system/pandora-scripts/none_up_v3
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0

diff --git a/recipes/pandora-system/pandora-scripts/none_up_v5 b/recipes/pandora-system/pandora-scripts/none_up_v5
deleted file mode 100644 (file)
index 3731355..0000000
--- a/recipes/pandora-system/pandora-scripts/none_up_v5
+++ /dev/null
@@ -1,8 +0,0 @@
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0
-  0   0 128   0   0

diff --git a/recipes/pandora-system/pandora-scripts/op_videofir.sh b/recipes/pandora-system/pandora-scripts/op_videofir.sh
index 7b3396c..2461b0d 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_videofir.sh
+++ b/recipes/pandora-system/pandora-scripts/op_videofir.sh
@@ -15,14 +15,15 @@ fi
 
 apply_filter()
 {
-       file="${1}_${2}"
+       file="${1}"
        if [ -f "$file" ]; then
                # hardcode overlay for now.. We'll update this as needed
-               echo "writing fir: $2"
-               cat "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_$2"
+               echo "writing fir:"
+               head -n1 "$file"
+               sed -n 3,10p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_h"
+               sed -n 12,19p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_v3"
+               sed -n 21,28p "$file" > "/sys/devices/platform/omapdss/overlay1/filter_coef_up_v5"
        fi
 }
 
-apply_filter "${base_path}" up_h
-apply_filter "${base_path}" up_v3
-apply_filter "${base_path}" up_v5
+apply_filter "${base_path}"
\ No newline at end of file