summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrikant Patnaik2015-03-09 11:43:00 +0530
committerSrikant Patnaik2015-03-09 11:43:00 +0530
commit884571c0e69cb7fc913db2b250cef799598d7024 (patch)
treebb23df36175aa9884b4f648036c054d42f9bef7b
parent456b3930c2e3be19ae623db88d05b2cdfc1d2434 (diff)
parentdcfceabac8aa51d45eb56fb21a13c873b9e8d00a (diff)
downloadFOSSEE-netbook-tools-884571c0e69cb7fc913db2b250cef799598d7024.tar.gz
FOSSEE-netbook-tools-884571c0e69cb7fc913db2b250cef799598d7024.tar.bz2
FOSSEE-netbook-tools-884571c0e69cb7fc913db2b250cef799598d7024.zip
Merge branch 'master' of https://github.com/FOSSEE/FOSSEE-netbook-tools
-rwxr-xr-xprobe-hdmi/probe-hdmi.sh2
-rw-r--r--webcam-recorder/README.rst24
-rw-r--r--webcam-recorder/libv4l.tgzbin0 -> 963842 bytes
-rw-r--r--webcam-recorder/webcam-recorder.desktop11
-rw-r--r--webcam-recorder/webcam-recorder.pngbin0 -> 286384 bytes
-rwxr-xr-xwebcam-recorder/webcam-recorder.sh3
6 files changed, 39 insertions, 1 deletions
diff --git a/probe-hdmi/probe-hdmi.sh b/probe-hdmi/probe-hdmi.sh
index 8cefb87..c37108c 100755
--- a/probe-hdmi/probe-hdmi.sh
+++ b/probe-hdmi/probe-hdmi.sh
@@ -85,7 +85,7 @@ if [ $kernel_resolution == '1024x720p' ] && [ ! -f $xorg ]; then
message -w 500 -h 400 "There are two possible settings, A and B. You are in Setting-A (default setting).\\nIt is recommended to connect HDMI/HDMI-to-VGA cable to netbook and restart. HDMI might work with thick bottom bar. You can also use this application through console by typing 'probehdmi'.\\n Select 'Ok' to continue"
-return_code_A=$(question -w 600 -h 300 "If setting-A doesn't work, you may try setting-B. The setting-B will make your bottom panel unavailable on netbook screen, but HDMI might work in full screen mode. Your desktop will be reloaded.\\nSelect 'Ok' to try setting-B, select 'Cancel' to continue Setting-A. \\nYou may change from setting-B to setting-A anytime by revisiting this application." 2>&1)
+return_code_A=$(question -w 600 -h 300 "If setting-A doesn't work, you may try setting-B. The setting-B will make your bottom panel unavailable on netbook screen, but HDMI might work in full screen mode. Your desktop will be reloaded.\\nSelect 'Ok' to try setting-B, select 'Cancel' to continue Setting-A. \\nYou may change from setting-B to setting-A anytime by revisiting this application or by restarting the netbook" 2>&1)
[ $return_code_A -eq 1 ] && exit 0
sudo cp -v $fb1 $xorg
diff --git a/webcam-recorder/README.rst b/webcam-recorder/README.rst
new file mode 100644
index 0000000..37f7519
--- /dev/null
+++ b/webcam-recorder/README.rst
@@ -0,0 +1,24 @@
+README
+======
+
+A simple vlc command to run webcam utility. It will presently work only
+custom v4l2 library.
+
+The custom v4l2 library is available in present working directory. The
+modified kernel module is available with Kernel Build-5.0 (github.com/FOSSEE/FOSSEE-netbook-kernel-source).
+
+Steps to compile v4l2
+---------------------
+
+* tar -xzf libv4l.tgz
+
+* cd libv4l
+
+* make clean && make
+
+* sudo sh v4l_lib_copy.sh
+
+* sync && reboot
+
+
+Contributed by: Manish Patel
diff --git a/webcam-recorder/libv4l.tgz b/webcam-recorder/libv4l.tgz
new file mode 100644
index 0000000..4baffef
--- /dev/null
+++ b/webcam-recorder/libv4l.tgz
Binary files differ
diff --git a/webcam-recorder/webcam-recorder.desktop b/webcam-recorder/webcam-recorder.desktop
new file mode 100644
index 0000000..c122d4a
--- /dev/null
+++ b/webcam-recorder/webcam-recorder.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Keywords=Webcam Recorder
+Name=Webcam Recorder
+Comment=Webcam Recorder
+Exec=bash /opt/FOSSEE-netbook-tools/webcam-recorder/webcam-recorder.sh
+Icon=/opt/FOSSEE-netbook-tools/webcam-recorder/webcam-recorder.png
+Terminal=false
+Type=Application
+MimeType=text/plain
+Categories=GTK;Other;
diff --git a/webcam-recorder/webcam-recorder.png b/webcam-recorder/webcam-recorder.png
new file mode 100644
index 0000000..423835d
--- /dev/null
+++ b/webcam-recorder/webcam-recorder.png
Binary files differ
diff --git a/webcam-recorder/webcam-recorder.sh b/webcam-recorder/webcam-recorder.sh
new file mode 100755
index 0000000..40b28d0
--- /dev/null
+++ b/webcam-recorder/webcam-recorder.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+vlc v4l2:///dev/video0 --v4l2-width 640 --v4l2-height 480 --v4l2-chroma NV21 --v4l2-fps 15 --v4l2-brightness 0 --v4l2-contrast 0 --v4l2-saturation 0 --v4l2-hue 0 --v4l2-auto-white-balance 0