Merge pull request #2 from SuborbitalPigeon/master

looks good :)

Author: webpigeon

ffmpeg/youtube.sh

@@ -10,6 +10,15 @@ if [ -z "$1" ]; then
 	echo "Needs a file to convert" >&2
 	exit 1
 else
-	# Ratefactor can be varied according to taste
-	ffmpeg -i "$INPUT" -c:a libopus -b:a 128k -c:v libx264 -crf 25 -sn $OUTPUT.mkv
+	# See https://support.google.com/youtube/answer/1722171?hl=en
+	# Summary:
+	# ffmpeg native AAC encoder, set for stereo recommended bitrate
+	# -preset slow -> Set to the slowest preset that you can be bothered with
+	# -crf 25 -> Somewhat arbitrary, see document above for bitrate guidance, CRF mode should be better quality than 1 pass VBR
+	# -g 12 -> GOP size of 12, should be half of framerate
+	# -bf 2 -> Number of consecutive b frames
+	# -flags +cgop -> closed GOP
+	# -pix_fmt yuv420p -> YUV 4:2:0 subsampling
+	# -tune film -> For live action videos, feel free to choose another tune parameter
+	ffmpeg -i "$INPUT" -c:a aac -strict -2 -b:a 384k -c:v libx264 -preset slow -crf 25 -g 12 -bf 2 -flags +cgop -pix_fmt yuv420p -tune film $OUTPUT.mp4
 fi

opencv/README.md

@@ -0,0 +1,16 @@
+Setting up OpenCV 3.1
+=====================
+
+```bash
+wget https://github.com/Itseez/opencv/archive/3.1.0.tar.gz -O opencv-3.1.0.tar.gz
+wget https://github.com/Itseez/opencv\_contrib/archive/3.1.0.tar.gz -O opencv_contrib-3.1.0.tar.gz
+tar -xf opencv-3.1.0.tar.gz
+tar -xf opencv_contrib-3.1.0.tar.gz
+cd opencv-3.1.0
+wget -O - https://github.com/Itseez/opencv/pull/6009.diff | patch -p1
+mkdir release
+cd release
+cmake -DOPENCV\_EXTRA\_MODULES\_PATH=../../opencv_contrib-3.1.0/modules ../
+make -j4
+sudo make install
+```

opencv/orb-kps.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+
+import cv2
+from matplotlib import pyplot as plt
+
+img = cv2.imread("<image_name>")
+orb = cv2.ORB_create()
+kps = orb.detect(img)
+
+kpimg = cv2.drawKeypoints(img, kps, None, None, cv2.DRAW_MATCHES_FLAGS_DRAW_RICH_KEYPOINTS)
+plt.imshow(kpimg)
+plt.show()