Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c428775c0dd9262122f1d343bf8cd8b73954bc41
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c428775c0dd9262122f1d343bf8cd8b73954bc41
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c428775c0dd9262122f1d343bf8cd8b73954bc41
The branch, master has been updated
via c428775c0dd9262122f1d343bf8cd8b73954bc41 (commit)
from e181a7fcf243f41c06c101446ebac4358595732f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c428775c0dd9262122f1d343bf8cd8b73954bc41
commit c428775c0dd9262122f1d343bf8cd8b73954bc41
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
update gource generation script for this years upload
diff --git a/Docs/gource.sh b/Docs/gource.sh
index 9c715be..a1fbcbe 100755
--- a/Docs/gource.sh
+++ b/Docs/gource.sh
@@ -9,20 +9,21 @@
TITLE="Netsurf"
# length and quality
-TYPE="sml" # sml, std, lrg
+TYPE="std" # sml, std, lrg
#Camera mode
CMODE=overview # overview, track
# standard monitor (suitable for video projector playback)
-OUTPUT_SIZE="1024x768"
+#OUTPUT_SIZE="1024x768"
# HD widescreen 720p
-#OUTPUT_SIZE="1280x720"
+OUTPUT_SIZE="1280x720"
# HD widescreen 1080p
#OUTPUT_SIZE="1280x1080"
+TMP_DIR=/net/holly/srv/video/Unsorted/
######################################################################
@@ -51,22 +52,20 @@ case ${TYPE} in
esac
-# filename
+echo "Generating ${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}"
+
+TMP_PPM=${TMP_DIR}/${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}.ppm
+
+# output filename
FILENAME=${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}.mp4
# filter some directories which are not interesting
FILEFILTER="\!NetSurf/|riscos/distribution/|gtk/res/|framebuffer/res/|amiga/resources/|beos/res/|cocoa/res/|windows/res/|atari/res"
-#gource -1280x720 -s 0.04 -i 30 -a 1 --highlight-all-users --output-framerate
25 --hide filenames --disable-progress --stop-at-end --date-format "%d %B %Y"
--bloom-intensity 0.2 --file-filter '/art/' --file-filter '/changemailer/'
--file-filter '/libnspng/' --file-filter '/libnsbmp/examples/' --file-filter
'/netsurfweb/' --file-filter '/netsurfbuild/' --file-filter '/netsurftest/'
--file-filter '/hubbub/test/' --file-filter '/dom/test/' --file-filter
'/iconv/' --file-filter '/libharu/' --camera-mode track --output-ppm-stream - >
temp.ppm
-
-#gource -1280x720 -s 0.04 -i 30 -a 1 --bloom-multiplier 0.10 --bloom-intensity
0.5 --title "Netsurf" --highlight-all-users --output-framerate 25 --hide
filenames --stop-at-end --date-format "%d %B %Y" --bloom-intensity 0.2
--file-filter '/art/' --file-filter '/changemailer/' --file-filter '/libnspng/'
--file-filter '/libnsbmp/examples/' --file-filter '/netsurfweb/' --file-filter
'/netsurfbuild/' --file-filter '/netsurftest/' --file-filter '/hubbub/test/'
--file-filter '/dom/test/' --file-filter '/iconv/' --file-filter '/libharu/'
--camera-mode track --output-ppm-stream - > temp.ppm
-
-#gource -stop-at-end --key 5C--title "NetSurf Development" --highlight-users
--max-file-lag -1 -f -1280x720 --seconds-per-day 0.06 --hide
mouse,progress,filenames --file-idle-time 20 --disable-bloom --date-format "%e
%b %Y" -o - | ffmpeg -y -r 60 -f image2pipe -vcodec ppm -i - -vcodec libx264
-preset veryslow -crf 1 -threads 0 -bf 0 gource.mp4
-
# generate
-gource --title "NetSurf Development" -${OUTPUT_SIZE} ${QPARAM} --max-files
10000 --bloom-multiplier 0.10 --bloom-intensity 0.5 --title ${TITLE}
--highlight-all-users --output-framerate 25 --hide filenames --stop-at-end
--date-format "%d %B %Y" --bloom-intensity 0.2 --file-filter "${FILEFILTER}"
--key --camera-mode ${CMODE} --output-ppm-stream - > temp.ppm
+gource --title "NetSurf Development" -${OUTPUT_SIZE} ${QPARAM} --max-files
10000 --bloom-multiplier 0.10 --bloom-intensity 0.5 --title ${TITLE}
--highlight-all-users --output-framerate 25 --hide filenames --stop-at-end
--date-format "%d %B %Y" --bloom-intensity 0.2 --file-filter "${FILEFILTER}"
--key --camera-mode ${CMODE} --output-ppm-stream - > ${TMP_PPM}
#convert the ppm to movie
-cat temp.ppm | ffmpeg -y -b 2000K -r 25 -f image2pipe -vcodec ppm -i - -vcodec
libx264 ${FILENAME}
+ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i ${TMP_PPM} -vcodec libx264 -b:v
2000k ${FILENAME}
-----------------------------------------------------------------------
Summary of changes:
Docs/gource.sh | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/Docs/gource.sh b/Docs/gource.sh
index 9c715be..a1fbcbe 100755
--- a/Docs/gource.sh
+++ b/Docs/gource.sh
@@ -9,20 +9,21 @@
TITLE="Netsurf"
# length and quality
-TYPE="sml" # sml, std, lrg
+TYPE="std" # sml, std, lrg
#Camera mode
CMODE=overview # overview, track
# standard monitor (suitable for video projector playback)
-OUTPUT_SIZE="1024x768"
+#OUTPUT_SIZE="1024x768"
# HD widescreen 720p
-#OUTPUT_SIZE="1280x720"
+OUTPUT_SIZE="1280x720"
# HD widescreen 1080p
#OUTPUT_SIZE="1280x1080"
+TMP_DIR=/net/holly/srv/video/Unsorted/
######################################################################
@@ -51,22 +52,20 @@ case ${TYPE} in
esac
-# filename
+echo "Generating ${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}"
+
+TMP_PPM=${TMP_DIR}/${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}.ppm
+
+# output filename
FILENAME=${TITLE}-gource-${TYPE}-${OUTPUT_SIZE}-${CMODE}.mp4
# filter some directories which are not interesting
FILEFILTER="\!NetSurf/|riscos/distribution/|gtk/res/|framebuffer/res/|amiga/resources/|beos/res/|cocoa/res/|windows/res/|atari/res"
-#gource -1280x720 -s 0.04 -i 30 -a 1 --highlight-all-users --output-framerate
25 --hide filenames --disable-progress --stop-at-end --date-format "%d %B %Y"
--bloom-intensity 0.2 --file-filter '/art/' --file-filter '/changemailer/'
--file-filter '/libnspng/' --file-filter '/libnsbmp/examples/' --file-filter
'/netsurfweb/' --file-filter '/netsurfbuild/' --file-filter '/netsurftest/'
--file-filter '/hubbub/test/' --file-filter '/dom/test/' --file-filter
'/iconv/' --file-filter '/libharu/' --camera-mode track --output-ppm-stream - >
temp.ppm
-
-#gource -1280x720 -s 0.04 -i 30 -a 1 --bloom-multiplier 0.10 --bloom-intensity
0.5 --title "Netsurf" --highlight-all-users --output-framerate 25 --hide
filenames --stop-at-end --date-format "%d %B %Y" --bloom-intensity 0.2
--file-filter '/art/' --file-filter '/changemailer/' --file-filter '/libnspng/'
--file-filter '/libnsbmp/examples/' --file-filter '/netsurfweb/' --file-filter
'/netsurfbuild/' --file-filter '/netsurftest/' --file-filter '/hubbub/test/'
--file-filter '/dom/test/' --file-filter '/iconv/' --file-filter '/libharu/'
--camera-mode track --output-ppm-stream - > temp.ppm
-
-#gource -stop-at-end --key 5C--title "NetSurf Development" --highlight-users
--max-file-lag -1 -f -1280x720 --seconds-per-day 0.06 --hide
mouse,progress,filenames --file-idle-time 20 --disable-bloom --date-format "%e
%b %Y" -o - | ffmpeg -y -r 60 -f image2pipe -vcodec ppm -i - -vcodec libx264
-preset veryslow -crf 1 -threads 0 -bf 0 gource.mp4
-
# generate
-gource --title "NetSurf Development" -${OUTPUT_SIZE} ${QPARAM} --max-files
10000 --bloom-multiplier 0.10 --bloom-intensity 0.5 --title ${TITLE}
--highlight-all-users --output-framerate 25 --hide filenames --stop-at-end
--date-format "%d %B %Y" --bloom-intensity 0.2 --file-filter "${FILEFILTER}"
--key --camera-mode ${CMODE} --output-ppm-stream - > temp.ppm
+gource --title "NetSurf Development" -${OUTPUT_SIZE} ${QPARAM} --max-files
10000 --bloom-multiplier 0.10 --bloom-intensity 0.5 --title ${TITLE}
--highlight-all-users --output-framerate 25 --hide filenames --stop-at-end
--date-format "%d %B %Y" --bloom-intensity 0.2 --file-filter "${FILEFILTER}"
--key --camera-mode ${CMODE} --output-ppm-stream - > ${TMP_PPM}
#convert the ppm to movie
-cat temp.ppm | ffmpeg -y -b 2000K -r 25 -f image2pipe -vcodec ppm -i - -vcodec
libx264 ${FILENAME}
+ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i ${TMP_PPM} -vcodec libx264 -b:v
2000k ${FILENAME}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
