summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xtools/convert2theora45
-rwxr-xr-xtools/csv156
-rwxr-xr-xtools/fade.sh25
-rw-r--r--tools/image_text26
-rwxr-xr-xtools/intro53
-rwxr-xr-xtools/outro32
-rwxr-xr-xtools/test.csv2
-rwxr-xr-xtools/test2.sh31
8 files changed, 353 insertions, 17 deletions
diff --git a/tools/convert2theora b/tools/convert2theora
new file mode 100755
index 0000000..acdb12e
--- /dev/null
+++ b/tools/convert2theora
@@ -0,0 +1,45 @@
+#!/bin/bash
+# ikke i svn
+
+EXT=`echo "$1"|awk -F . '{print $NF}'`
+BASENAME=`basename $1 .$EXT`
+
+WHAT=`./csv $2 $1 what`
+DATE=`./csv $2 $1 date`
+LOCATION=`./csv $2 $1 location`
+TITLE=`./csv $2 $1 title`
+NAME=`./csv $2 $1 name`
+LICENSE=`./csv $2 $1 license`
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 <video-file> [<csv-file>]"
+ exit 1
+fi
+
+if [ ! -f "$BASENAME.ogv" ] ; then
+ echo "Generating $BASENAME.ogv"
+
+ if [ $2 ]; then
+ ffmpeg2theora $1 -o $BASENAME.ogv \
+ --width 384 --height 288 \
+ --artist "$NAME" \
+ --title "$TITLE" \
+ --date "$DATE" \
+ --location "$LOCATION" \
+ --license "$LICENSE" \
+ > "$BASENAME.ogv-compresslog" 2>&1
+
+# --organization # Name of organization (studio)
+# --copyright # Copyright
+# --license $LICENSE \
+# --contact # Contact link
+
+ else
+ ffmpeg2theora $1 -o $BASENAME.ogv
+ # --width 384 --height 288
+ # > "$BASENAME.ogv-compresslog" 2>&1
+ fi
+else
+ echo "$BASENAME.ogv allready exist!"
+ exit 1
+fi
diff --git a/tools/csv b/tools/csv
new file mode 100755
index 0000000..130fb43
--- /dev/null
+++ b/tools/csv
@@ -0,0 +1,156 @@
+#!/usr/bin/perl
+#
+# Date: -
+# Author: Ole Kristian Lien
+# License: GNU General Public License
+#
+# ?
+#
+# libtext-csv-perl
+
+use strict;
+use warnings;
+use Text::CSV;
+
+if ($#ARGV != 2 ) {
+ print "usage: csv <csv-file> [<video-file> [<info>]]\n";
+ exit;
+}
+
+my $file=$ARGV[0];
+my $video=$ARGV[1];
+my $info=$ARGV[2];
+
+my @filename;
+my @logo;
+my @name;
+my @title;
+my @what;
+my @date;
+my @location;
+my @license;
+my @takk;
+my @url;
+
+my $csv = Text::CSV->new();
+open (CSV, "<:encoding(utf8)", "$file") or die "$file: $!";
+
+while (<CSV>) {
+ if ($csv->parse($_)) {
+ my @columns = $csv->fields();
+
+ if ($. == 1) {
+ my $index;
+ foreach (@columns) {
+ if ($_ eq "Filename") {
+ push(@filename, $index);
+ } elsif ($_ eq "Title") {
+ push(@title, $index);
+ } elsif ($_ eq "Logo") {
+ push(@logo, $index);
+ } elsif ($_ eq "Name") {
+ push(@name, $index);
+ } elsif ($_ eq "Title") {
+ push(@title, $index);
+ } elsif ($_ eq "What") {
+ push(@what, $index);
+ } elsif ($_ eq "Date") {
+ push(@date, $index);
+ } elsif ($_ eq "Location") {
+ push(@location, $index);
+ } elsif ($_ eq "License") {
+ push(@license, $index);
+ } elsif ($_ eq "Takk") {
+ push(@takk, $index);
+ } elsif ($_ eq "URL") {
+ push(@url, $index);
+ }
+ $index++;
+ }
+ }
+
+ next if ($. == 1);
+
+# my $filename = $columns[0];
+# my $logo = $columns[1];
+# my $name = $columns[2];
+# my $title = $columns[3];
+# my $what = $columns[4];
+# my $date = $columns[5];
+# my $location = $columns[6];
+# my $license = $columns[7];
+# my $takk = $columns[8];
+
+# my $filenametmp = fileparse($filename, qr/\.\D.*/);
+
+# unless (-e $filename) {
+# print "File: $filename doesn't Exist!\n";
+# exit 1;
+# }
+
+
+ if ($info eq "filename") {
+# foreach (@filename) {
+ print "$filename[2]";
+# }
+ } elsif ($info eq "logo") {
+ foreach (@logo) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "name") {
+ foreach (@name) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "title") {
+ foreach (@title) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "what") {
+ foreach (@what) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "date") {
+ foreach (@date) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "location") {
+ foreach (@location) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "license") {
+ foreach (@license) {
+ print "$columns[$_]";
+ }
+ } elsif ($info eq "takk") {
+# foreach (@takk) {
+# print "$columns[$_]";
+# }
+ foreach (@takk) {
+ my $test = $columns[$_];
+ if($test) {
+ my @takk = split(/:/, $test);
+ my $hva = $takk[0];
+ my $hvem = $takk[1];
+ print "$hvem - $hva\n";
+ }
+ }
+ } elsif ($info eq "url") {
+# foreach (@url) {
+# print "$columns[$_]";
+# }
+ foreach (@url) {
+ my $lenke = $columns[$_];
+ print "$lenke\n";
+ }
+
+ } else {
+ print "$info column doesn't exist\n";
+ }
+
+ } else {
+ my $err = $csv->error_input;
+ print "Failed to parse line #$..: $err";
+ }
+}
+
+close CSV;
diff --git a/tools/fade.sh b/tools/fade.sh
new file mode 100755
index 0000000..3f1f580
--- /dev/null
+++ b/tools/fade.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+count=0
+file="NUUG-logo-2-150-2.png"
+
+echo "Generating intro frame images"
+
+# Generate 50 fade-in frames
+for i in {1..50}; do
+ count=`expr $count + 1`
+ echo "Generating intro frame image $file ($count)"
+# convert -fill black -colorize $i% NUUG-logo-2-150-2.png test-$i.png
+done
+
+for i in {1..50}; do
+ count=`expr $count + 1`
+ echo "Generating intro frame image $file ($count)"
+ #cp 51 $count
+done
+
+for i in {1..50}; do
+count=`expr $count + 1`
+echo "Generating intro frame image $file ($count)"
+#cp 51 $count
+done
+
diff --git a/tools/image_text b/tools/image_text
index d67e9c8..97ee450 100644
--- a/tools/image_text
+++ b/tools/image_text
@@ -17,7 +17,6 @@ SIZE=`./video_resolution $1`
COUNTER=$2
BGCOLOR=$3
-# NEW ####
COUNT1=`echo $4 | wc -c`
COUNT2=`echo $5 | wc -c`
@@ -27,30 +26,25 @@ SIZE2="0"
if [ $COUNT1 -ge "30" ] ; then
SIZE1="30"
SIZE2=`echo $SIZE1-10|bc`
+ echo "Size1: $SIZE1 - Size2: $SIZE2"
elif [ $COUNT1 -ge "25" ] ; then
SIZE1="40"
SIZE2=`echo $SIZE1-10|bc`
+ echo "Size1: $SIZE1 - Size2: $SIZE2"
elif [ $COUNT1 -ge "20" ] ; then
SIZE1="50"
SIZE2=`echo $SIZE1-20|bc`
+ echo "Size1: $SIZE1 - Size2: $SIZE2"
else
SIZE1="60"
- SIZE2=`echo $SIZE1-20|bc`
-fi
+ if [ $COUNT2 -ge "25" ] ; then
+ SIZE2=`echo $SIZE1-30|bc`
+ else
+ SIZE2=`echo $SIZE1-20|bc`
+ fi
-
-#if [ $COUNT1 -ge "25" ] || [ $COUNT2 -ge "25" ] ; then
-# echo "25 eller over"
-#echo "$1. count1: $COUNT1, count2: $COUNT2"
-# SIZE1="40"
-# SIZE2="20"
-#else
-# echo "under 25"
-#echo "$1. count1: $COUNT1, count2: $COUNT2"
-# SIZE1="60"
-# SIZE2="40"
-#fi
-#########
+ echo "Size1: $SIZE1 - Size2: $SIZE2"
+fi
if [ -z "$4" ]; then
echo "Usage: $0 <video-file> <counter> <bg-color> <text1> [<text2>]"
diff --git a/tools/intro b/tools/intro
new file mode 100755
index 0000000..4d07934
--- /dev/null
+++ b/tools/intro
@@ -0,0 +1,53 @@
+#!/bin/bash
+# ikke i svn
+
+EXT=`echo "$1"|awk -F . '{print $NF}'`
+BASENAME=`basename $1 .$EXT`
+COUNT="10"
+
+LOGO=`./csv $2 $1 logo`
+WHAT=`./csv $2 $1 what`
+DATE=`./csv $2 $1 date`
+LOCATION=`./csv $2 $1 location`
+TITLE=`./csv $2 $1 title`
+NAME=`./csv $2 $1 name`
+LICENSE=`./csv $2 $1 license`
+
+if [ -z "$2" ]; then
+ echo "Usage: $0 <video-file> <csv-file>"
+ exit 1
+fi
+
+# LOGO
+./image_logo $1 intro-$COUNT white $LOGO
+COUNT=`expr $COUNT + 1`
+./image_logo $1 intro-$COUNT white $LOGO
+COUNT=`expr $COUNT + 1`
+./image_logo $1 intro-$COUNT white $LOGO
+COUNT=`expr $COUNT + 1`
+
+# SLIDE 1
+./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
+COUNT=`expr $COUNT + 1`
+./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
+COUNT=`expr $COUNT + 1`
+./image_text $1 intro-$COUNT white "$WHAT" "$DATE - $LOCATION"
+COUNT=`expr $COUNT + 1`
+
+# SLIDE 2
+./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
+COUNT=`expr $COUNT + 1`
+./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
+COUNT=`expr $COUNT + 1`
+./image_text $1 intro-$COUNT white "$TITLE" "$NAME"
+COUNT=`expr $COUNT + 1`
+
+# LICENSE
+cp $LICENSE.png $BASENAME-intro-$COUNT.png
+COUNT=`expr $COUNT + 1`
+cp $LICENSE.png $BASENAME-intro-$COUNT.png
+COUNT=`expr $COUNT + 1`
+cp $LICENSE.png $BASENAME-intro-$COUNT.png
+
+./image2video $1 intro
+rm $BASENAME-intro-*.png
diff --git a/tools/outro b/tools/outro
new file mode 100755
index 0000000..0e08a8e
--- /dev/null
+++ b/tools/outro
@@ -0,0 +1,32 @@
+#!/bin/bash
+# ikke i svn
+
+EXT=`echo "$1"|awk -F . '{print $NF}'`
+BASENAME=`basename $1 .$EXT`
+COUNT=10
+
+NAME=`./csv $2 $1 name`
+LOCATION=`./csv $2 $1 location`
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 <video-file> <csv-file>"
+ exit 1
+fi
+
+./image_text $1 outro-$COUNT black "TAKK TIL"
+COUNT=`expr $COUNT + 1`
+./image_text $1 outro-$COUNT black "TAKK TIL"
+COUNT=`expr $COUNT + 1`
+./image_text $1 outro-$COUNT black "TAKK TIL"
+COUNT=`expr $COUNT + 1`
+
+./image_text $1 outro-$COUNT black "$NAME" Foredragsholder
+COUNT=`expr $COUNT + 1`
+./image_text $1 outro-$COUNT black "$LOCATION" Lokaler
+COUNT=`expr $COUNT + 1`
+
+# takk
+# url
+
+./image2video $1 outro
+rm $BASENAME-outro*.png
diff --git a/tools/test.csv b/tools/test.csv
index 50fa683..2676998 100755
--- a/tools/test.csv
+++ b/tools/test.csv
@@ -1,2 +1,2 @@
"Filename","Logo","Name","Title","What","Date","Location","License","Takk","Takk","Takk","URL","URL"
-"20091016-wa-helland-introduksjon_til_wikipedia.dv","Wikimedia_Norge-logo.png","Frode Inge Helland","Introduksjon til Wikipedia","Wikipedia Workshop",2009-10-16,"Høgskolen i Bergen","cc-by-sa-3.0-no","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Lars Åge Kamfjord","http://nuug.no/","http://no.wikimedia.org/"
+"20091016-wa-helland-introduksjon_til_wikipedia.dv","Wikimedia_Norge-logo.png","Frode Inge Helland","Introduksjon til Wikipedia","Wikipedia Workshop",10/16/09,"Høgskolen i Bergen","cc-by-sa-3.0-no","Videogruppen:Ole Kristian Lien","Videogruppen:Hans-Petter Fjeld","Videogruppen:Lars Åge Kamfjord","http://nuug.no/","http://no.wikimedia.org/"
diff --git a/tools/test2.sh b/tools/test2.sh
new file mode 100755
index 0000000..e6adb45
--- /dev/null
+++ b/tools/test2.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# test
+# ikke i svn
+
+FILENAME=`./csv $2 $1 filename`
+LOGO=`./csv $2 $1 logo`
+NAME=`./csv $2 $1 name`
+TITLE=`./csv $2 $1 title`
+WHAT=`./csv $2 $1 what`
+DATE=`./csv $2 $1 date`
+LOCATION=`./csv $2 $1 location`
+LICENSE=`./csv $2 $1 license`
+TAKK=`./csv $2 $1 takk`
+URL=`./csv $2 $1 url`
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 <video-file> [<csv-file>]"
+ exit 1
+fi
+
+# filename er problemet
+echo "Filename: $FILENAME"
+echo "Logo: $LOGO"
+echo "Name: $NAME"
+echo "Title: $TITLE"
+echo "What: $WHAT"
+echo "Date: $DATE"
+echo "Location: $LOCATION"
+echo "License: $LICENSE"
+echo "Takk: $TAKK"
+echo "URL: $URL"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-25 17:16:49 +0000