diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2002-01-27 18:00:00 +0100 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2002-01-27 18:00:00 +0100 |
commit | 27919ee969866b68fc95b327a047a9989e4b4153 (patch) | |
tree | 1857862abf169ff6e9287152cd6fec6a1d9dbc41 /Tools/schnitt | |
parent | b420457467ad0c8ae71f8b985914e85b7a0ff5aa (diff) | |
download | vdr-patch-lnbsharing-27919ee969866b68fc95b327a047a9989e4b4153.tar.gz vdr-patch-lnbsharing-27919ee969866b68fc95b327a047a9989e4b4153.tar.bz2 |
Version 0.99pre2vdr-0.99pre2
- Fixed setting the OSD size in the 'Confirm' interface call (thanks to
Deti Fliegl).
- Removed the 'read incomplete section...' error message in the EIT processor.
- Fixed channel data for "DW TV" (thanks to Axel Gruber).
- Added DPID to "PREMIERE MOVIE 1" in channels.conf.cable (thanks to Stephan
Schreiber).
- Prepared the OSD functions for multiple overlapping windows.
- Removed the check to see whether the system time is running linearly.
- Improved performance of SVDRP command entry.
- Removed EPGBugfixLevel '3' - after more than a year Pro-7 finally managed to
broadcast the correct timestamps for EPG events between 0:00 and 6:00!
- Fixed failing watchdog timer if program hangs in OSD activities (thanks to
Carsten Koch).
- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and
REMOTE=KBD (thanks to Lauri Pesonen).
- The "Recordings" menu now displays a hierarchical structure if there are
subdirectories for the recordings. This can be controlled through the
"RecordingDirs" parameter in the "Setup" menu.
See "MANUAL/Replaying a Recording" for details.
- Improved speed of setting the Help button texts.
- Fixed handling file names that contain single quotes (') or dollar signs ($)
in the call to the shutdown command (option '-s') and the recording command
(option '-r').
- Improved error handling in the editing process; the resulting file will be
deleted if an error occured.
- A message is now prompted at the end of the editing process, indicating
whether the process succeeded or failed.
- Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to
Sergei Haller).
- A message is now prompted if free disk space becomes low during recording.
- The editing process now calls AssertFreeDiskSpace() to remove deleted
recordings if the disk becomes full.
- The "Main" menu now displays in its title the used disk space (in percent)
and the estimated free disk space (in hh:mm), assuming a data rate of 30 MB
per minute.
- Activating the "Recordings" menu now displays "scanning recordings..." to
give the user some feedback in case this takes longer.
- Status messages are now displayed centered.
- Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.
Diffstat (limited to 'Tools/schnitt')
-rw-r--r-- | Tools/schnitt/README | 111 | ||||
-rwxr-xr-x | Tools/schnitt/cut.pl | 35 | ||||
-rwxr-xr-x | Tools/schnitt/cut2 | 2 | ||||
-rwxr-xr-x | Tools/schnitt/cut2.pl | 39 | ||||
-rwxr-xr-x | Tools/schnitt/cut3.pl | 40 | ||||
-rwxr-xr-x | Tools/schnitt/cutall | 2 | ||||
-rwxr-xr-x | Tools/schnitt/cutall2 | 5 | ||||
-rwxr-xr-x | Tools/schnitt/cutall3.pl | 31 | ||||
-rwxr-xr-x | Tools/schnitt/cutt | 106 | ||||
-rw-r--r-- | Tools/schnitt/dump.c | 65 | ||||
-rwxr-xr-x | Tools/schnitt/getpreviframe.pl | 25 | ||||
-rw-r--r-- | Tools/schnitt/index.php | 215 | ||||
-rwxr-xr-x | Tools/schnitt/lmplex | 51 | ||||
-rwxr-xr-x | Tools/schnitt/mv2 | 30 | ||||
-rwxr-xr-x | Tools/schnitt/play | 10 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt.pl | 27 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt2.pl | 93 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt3.pl | 64 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt3.pl.new | 77 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt4.pl | 13 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt5.pl | 16 | ||||
-rwxr-xr-x | Tools/schnitt/schnitt6.pl | 30 | ||||
-rwxr-xr-x | Tools/schnitt/schnittcommon.pli | 64 | ||||
-rwxr-xr-x | Tools/schnitt/show | 11 | ||||
-rwxr-xr-x | Tools/schnitt/unsort | 25 | ||||
-rwxr-xr-x | Tools/schnitt/vdr-remote.pl | 40 | ||||
-rwxr-xr-x | Tools/schnitt/vdr2 | 2 | ||||
-rwxr-xr-x | Tools/schnitt/vmount | 18 |
28 files changed, 0 insertions, 1247 deletions
diff --git a/Tools/schnitt/README b/Tools/schnitt/README deleted file mode 100644 index 8e1cacc..0000000 --- a/Tools/schnitt/README +++ /dev/null @@ -1,111 +0,0 @@ - Sammlung von "Hilfs"-Scripten - von Matthias Schniedermeyer - ms@citd.de - -Diese Sammlung an "Hilfs"-Scripten habe ich mir zum scheiden und anderen -Zwecken zusammengeschrieben. - -Das ganze unterliegt natuerlich der GPL. - -Ich bin nicht sonderlich gut im "Dokumentieren". Also gilt die Devise -"Hilf dir selbst". - -Ein paar Worte zu den "Hart"-Codierten Pfaden. - -/dvb/video -/dvb2/video - -Sind die 2 DVB-Rechner. - -/x1/video - -Ist das Verzeichniss in das die Video zum schneiden verschoben werden. - -/x1/temp -/x2/temp - -Sind die beim schneiden verwendeten Temporaer-Verzeichnisse - - -Enthalten sind folgende Scripte: - -cutall -> "Master"-Script zum starten des Scheide vorgangs. - Ist ein "find" nach "cut" -Dateien -cutt -> Das "eigentliche" Schnitt-Script - Bei einem einzelnen Block wird diese direkt - gesplitet und dann zu einem ISO-Image verarbeitet - Wenn mehrere Teile (=War mit Werbung) vorhanden - sind, dann werden zuerst die einzelnen Teile, - legt nummerierte Verzeichniss ein und kopiert bzw - splitet die einzelnen Dateien in die Verzeichniss - und macht dann daraus die ISO-Images - (Leider funktioniert das aus irgendwelche Gruenden - (noch) nicht mit Serien die nur eine CD gross sind - aber das wird noch) -index.php -> PHP-Script zum finden der Schnitt-Punkte, mit - Testmoeglichkeit ob erfolgreich an diesem Punkt - geschnitten werden kann -mv2 -> Zum Moven der Aufnahmen von meinen DVB-Rechnern - auf mein "Arbeitsrechner" -play -> Zum Abspielen einer Aufnahme von meinem Recher auf - dem "Frontend" DVB-Rechner -schnitt.pl -> Extraiert ein einzelnes Bild um es anzuzeigen - (Fuer index.php) -schnitt2.pl -> Gibt alles zwischen 2 Schnittpunkten auf STDOUT aus -schnitt3.pl -> Testet ob erfolgreich geschnitten werden kann. -schnitt3.pl.new -> Version fuer PES-Datenstroeme -schnitt4.pl -> "Beschleunigtes" Schnitt-Programm fuer VIVA - aufnahmen. 1 "VIDEO" pro Zeile erzeugt - "a", "b" ... Dateien -schnitt5.pl -> Gibt Datei-Nummern von einer Schnittmarke - +- 15000 Frames aus -schnitt6.pl -> Loescht alle Dateien die nicht von in einer von - schnitt5.pl abgedeckt ist. (Damit mv2 nicht so - lange braucht) -show -> Wird auf einem X-Display gestartet und zeigt das - aktuelle Bild von "schnitt.pl" an -vdr-remote.pl -> "Skeleton" um ueber SVDR-Kommandos zu schicken -vdr2 -> Start-Script -vmount -> Mounten aller zusammengehoeriger ISO-Images zum - abspielen - -Hilfsscripte: ------------- -cut.pl -> Entspricht weitestgehend "split" aber mit - "Nummer" anstatt Buchstaben -cut2 -> Entfernt escapende Backslashes -cut2.pl/cut3.pl -> Fuer Aufnehmen die aus mehreren Bloecken bestehen - (=Mit Werbung) -cutall2 -> Springt ins Schnitt-Verzeichniss und ruft das - "eigentliche" Schnitt-Script auf -cutall3.pl -> Wenn in einem Verzeichniss mehrere Aufnahmen sind - splitet dies Programm diese und ruft fuer jede - Aufnahme das "cutt"-Script auf -schnittcommon.pli -> Das "Common" Script fuer schnitt?.pl -getpreviframe.pl -> Findet das vorherige I-Frame. -unsort -> Macht das Gegenteil von sort. - -dump.c -> Muss in der "libmpeg3"-Verzeichniss des - "mpeg2-movie"-Packets kopiert werden und dann mit - "make" compilieren - Dieses C-Programm ist dafuer da um fuer das - PHP-Script das Bild anzuzeigen wo man gerade ist. - Da mir der "urspruengliche" Source-Code dafuer - abhanden gekommen ist und ich den Patch neumachen - musste (Wie immer mit "Verbesserungen") ist index.php - nocht nicht auf die neue Version angepasst. Die - Anpassung besteht aber nur darin eine "1" an die - Kommandozeile anzuhaengen. - - -Im Gegensatz zur "alten"-Version ist diese Version "vollstaendig" -einsatzfaehig! - - -Wenn jemand Fragen zum Einsatz hat dann "loechern Sie mich" - -ms@citd.de - - -Ich kann auch gerne die Einrichtung per "Fernwartung" (=ssh) uebernehmen. -(Wenn noetig compiliere ich auch auch apache mit PHP usw.) diff --git a/Tools/schnitt/cut.pl b/Tools/schnitt/cut.pl deleted file mode 100755 index e055076..0000000 --- a/Tools/schnitt/cut.pl +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/perl - -chdir ($ARGV[0]) if ($ARGV[0]); - -$read = $size = 1024*1024; - -$filenum = "1"; -$count = 0; - -$fi = sprintf ("part%d",$filenum); -open (FI,">$fi"); - -while ($read == $size) - { - if ($count < 660*1024*1024) - { - $read = read (STDIN,$data,$size); - print FI $data; - $count += $size; - $a = $count /1024/1024; - if ($a % 10 == 0) { - print stderr "File: $filenum Size: ${a}MB\n"; - } - } - else - { - close (FI); - $filenum++; - $fi = sprintf ("part%d",$filenum); - open (FI,">$fi"); - $count = 0; - } - } - -close FI; diff --git a/Tools/schnitt/cut2 b/Tools/schnitt/cut2 deleted file mode 100755 index 09e9acb..0000000 --- a/Tools/schnitt/cut2 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -cat cut2 | head -n 1 | tr -d [\\\\] diff --git a/Tools/schnitt/cut2.pl b/Tools/schnitt/cut2.pl deleted file mode 100755 index 6131e88..0000000 --- a/Tools/schnitt/cut2.pl +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl - -$titel = $ARGV[0]; - -chdir ("/x2/temp"); - -@files=<teil*.mpg>; -$cd = 1; -mkdir "/x2/temp/$cd"; -open (FF,">/x2/temp/$cd/$titel\ CD\ $cd"); -close (FF); - -foreach $file (@files) - { - $size = -s $file; - $total += $size; - if ($total <= 660*1024*1024) - { - print "Moving $file\n"; - system ("mv /x2/temp/$file /x2/temp/$cd/$file"); - } - else - { - print "Splitting $file\n"; - $file =~ s/\.mpg$//; - $total -= $size; - $size = (660*1024*1024) - $total; - $cd = `cut3.pl /x2/temp $cd $file $size \'$titel\' < $file.mpg`; - chomp $cd; - $total = 0; - @files2=</x2/temp/$cd/teil*>; - foreach $file2 (@files2) - { - $total += -s $file2; - } - print "CD: $cd Total $total\n"; - unlink "$file.mpg"; - } - } diff --git a/Tools/schnitt/cut3.pl b/Tools/schnitt/cut3.pl deleted file mode 100755 index ddaf0d6..0000000 --- a/Tools/schnitt/cut3.pl +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl - -$read = $size = 1024*1024; - -$dir = $ARGV[0]; -$subdir = $ARGV[1]; -$teil = $ARGV[2]; -$count1 = $ARGV[3]; -$title = $ARGV[4]; - -$filenum = "1"; -$count = 0; - -open (FI,">$dir/$subdir/$teil.$filenum.mpg"); - -while ($read == $size) - { - if (($filenum == 1 && $count < $count1) || ($filenum > 1 && $count < 660*1024*1024)) - { - $read = read (STDIN,$data,$size); - print FI $data; - $count += $size; - $a = $count /1024/1024; - } - else - { - close (FI); - $filenum++; - $subdir++; - mkdir ("$dir/$subdir"); - open (FF,">$dir/$subdir/$title\ CD\ $subdir"); - close (FF); - open (FI,">$dir/$subdir/$teil.$filenum.mpg"); - $count = 0; - } - } - -close FI; - -print "$subdir\n"; diff --git a/Tools/schnitt/cutall b/Tools/schnitt/cutall deleted file mode 100755 index a6803e2..0000000 --- a/Tools/schnitt/cutall +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -find /x1/video/ -name "cut" -exec cutall2 {} \; diff --git a/Tools/schnitt/cutall2 b/Tools/schnitt/cutall2 deleted file mode 100755 index 962d577..0000000 --- a/Tools/schnitt/cutall2 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -a=`echo $1 | cut -d / -f1-5` -cd $a -cutall3.pl -mv cut cut.bak diff --git a/Tools/schnitt/cutall3.pl b/Tools/schnitt/cutall3.pl deleted file mode 100755 index 6961666..0000000 --- a/Tools/schnitt/cutall3.pl +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/perl - -open (FI,"cut") or die "Kann Cut-Datei nicht oeffnen\n"; - -outer: while (<FI>) - { - chomp; - if (! ($_ > 1 || $_ eq "0")) - { - open (FO,">cut2"); - print FO "$_\n"; - while (<FI>) - { - chomp; - if ($_ > 1 || $_ eq "0") - { - print FO "$_\n"; - } - else - { - system ("cutt"); - redo outer; - } - } - } - } -if ( -f "cut2") - { - system ("cutt"); - unlink "cut2"; - } diff --git a/Tools/schnitt/cutt b/Tools/schnitt/cutt deleted file mode 100755 index 1942437..0000000 --- a/Tools/schnitt/cutt +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -DIRA=/x2/temp -DIRB=/x1/temp - -if [ ! -f cut2 ]; then - echo Keine Beschreibungsdatei - exit 1 -else - name="`cut2`" - echo $name - count=`cat cut2 | wc -l` - let count=count-1 - let test=count%2 - if [ "$test" == "1" ]; then - echo Ungerade Anzahl von Markierungen - exit 1 - fi - - file=1 - - if [ "$count" == "2" ]; then - start=`cat cut2 | tail -n $count | head -n 1` - let count=count-1 - end=`cat cut2 | tail -n $count | head -n 1` - schnitt2.pl $start $end | avpes2mpeg | cut.pl $DIRA - secondway=2 - else - while [ "$count" != "0" ] - do - start=`cat cut2 | tail -n $count | head -n 1` - let count=count-1 - end=`cat cut2 | tail -n $count | head -n 1` - let count=count-1 - echo Cutting \& Converting from $start to $end - schnitt2.pl $start $end | avpes2mpeg > $DIRA/teil$file.mpg -# schnitt2.pl $start $end | pvademux $DIRA teil$file - let file=file+1 - done - fi -fi - -# Ab hier mkimg - -rm cut2 - -sync - -if [ "$secondway" != "2" ]; then - cd $DIRA - cut2.pl "$name" - if [ -d 2 ]; then - count=1 - cond=0 - - while [ "$cond" != "1" ] - do - echo mkisofs Teil $count - mkisofs -r -o $DIRB/image1.raw $count - rm -rf $count - mv -- $DIRB/image1.raw "$DIRB/${name} CD $count" - sync - let count=count+1 - if [ ! -d $count ]; then - cond=1 - fi - done - else - echo mkisofs - mkisofs -r -o $DIRB/image1.raw $count - rm -rf $count - mv -- $DIRB/image1.raw "$DIRB/${name}" - fi -else - - cd $DIRA - - if [ -f part2 ]; then - count=1 - cond=0 - - while [ "$cond" != "1" ] - do - mkdir a - mv "part$count" "a/${name} CD $count.mpg" - echo mkisofs Teil $count - mkisofs -r -o $DIRB/image1.raw a - rm -rf a - mv -- $DIRB/image1.raw "$DIRB/${name} CD $count" - sync - - let count=count+1 - if [ ! -f "part$count" ]; then - cond=1 - fi - done - else - mkdir a - mv part1 "a/${name}.mpg" - echo mkisofs - mkisofs -r -o $DIRB/image1.raw a - rm -rf a - mv -- $DIRB/image1.raw "$DIRB/${name}" - fi -fi - diff --git a/Tools/schnitt/dump.c b/Tools/schnitt/dump.c deleted file mode 100644 index a362f68..0000000 --- a/Tools/schnitt/dump.c +++ /dev/null @@ -1,65 +0,0 @@ -#include "libmpeg3.h" -#include <stdlib.h> -#include <unistd.h> -#include <fcntl.h> -#include <string.h> - -int main(int argc, char *argv[]) -{ - mpeg3_t *file; - int x,y,ii,i,j,result,out; - int howmany; - unsigned char *output, **output_rows; - char filename[100]; - char header[100]; - char temp; - - howmany = atoi (argv[2]); - - if ((file = mpeg3_open(argv[1])) == NULL) - { - printf ("Open failed\n"); - return 1; - } - mpeg3_set_cpus(file,1); - mpeg3_set_mmx(file,0); - if (mpeg3_has_video == 0) - { - printf ("Stream has no Video\n"); - return 1; - } - x = mpeg3_video_width(file,0); - y = mpeg3_video_height(file, 0); - output = malloc (x*y*3 + 4); - output_rows = malloc (sizeof(unsigned char*) * y); - for(i = 0; i < y; i++) - output_rows[i] = &output[i * x * 3]; - - for (ii = 0; ii < howmany; ii++) - { - result = mpeg3_read_frame(file,output_rows,0,0,x,y,x,y,0,0); - - sprintf (filename,"/x2/temp/output%03i.ppm",ii); - sprintf (header,"P6\n%i %i\n255\n\r",x,y); - -/* printf ("Opening %s\n",filename); */ - - if ((out = open (filename,O_CREAT|O_WRONLY|O_TRUNC,0755)) == -1) - { - printf ("Can't open %s\n",filename); - return 1; - } - - write (out,header,strlen(header)); - - for (i = 0; i < y; i++) - for (j = 0; j < x; j++) - { - temp = output [(i*x+j)*3 + 1]; - output[(i*x+j)*3 + 1] = output [(i*x+j)*3 + 0]; - output[(i*x+j)*3 + 0] = temp; - } - write (out, output, x*y*3); - close (out); - } -} diff --git a/Tools/schnitt/getpreviframe.pl b/Tools/schnitt/getpreviframe.pl deleted file mode 100755 index 4829304..0000000 --- a/Tools/schnitt/getpreviframe.pl +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/perl - -require "/usr/local/bin/my/schnittcommon.pli"; - -if (!open (INDEX,"index.vdr")) - { - exit 1; - } -$index = $oindex = $ARGV[0]; -if ($index > 0) -{ - &prevI; - if ($oindex != $index) - { - print "$index\n"; - } - else - { - print "$oindex\n"; - } -} -else -{ - print "0\n"; -} diff --git a/Tools/schnitt/index.php b/Tools/schnitt/index.php deleted file mode 100644 index 58a288f..0000000 --- a/Tools/schnitt/index.php +++ /dev/null @@ -1,215 +0,0 @@ -<html> -<head> - <title>Schneiden</title> -</head> -<body bgcolor=#C0C0C0> -<? -if ($level == 0) - { - $dircount=0; - $handle=opendir('/x1/video'); - while ($file = readdir($handle)) { - if ($file != "." && $file != ".." && $file != "epg.data") { - $dir=$file; - $dircount++; - } - } - if ($dircount == 1) { - $level=1; - } - else - { -?> -<center><h1>Sender</h1></center> -<form action="index.php" method="post"> -<input type=hidden name=level value="1"> -<? - $handle=opendir('/x1/video'); - while ($file = readdir($handle)) { - if ($file != "." && $file != ".." && $file != "epg.data") { - echo "<input type=submit name=dir value=\"$file\">\n"; - } - } - closedir($handle); -?> -</form> -<? - } - } -if ($level == 1) - { - $dircount=0; - $handle=opendir("/x1/video/$dir"); - while ($file = readdir($handle)) { - if ($file != "." && $file != "..") { - $dira="$dir/$file"; - $dircount++; - } - } - if ($dircount == 1) { - $dir = $dira; - $level = 2; - } - else - { -?> -<form action="index.php" method="post"> -<input type=hidden name=level value="2"> -<? - echo "<center><h1>Filme/Serien fuer den Sender $dir</h1></center>"; - $handle=opendir("/x1/video/$dir"); - while ($file = readdir($handle)) { - if ($file != "." && $file != "..") { - echo "<input type=submit name=dir value=\"$dir/$file\"><br>\n"; - } - } - closedir($handle); -?> -</form> -<? - } - } -if ($level == 2) - { -if ($aindex) - $index = $aindex; -else if (!$index) - $index = 0; - -if ($dir) - chdir ("/x1/video/$dir"); - -switch ($cindex) { - case "-10000": - if ($index >=10000) - $index -= 10000; - break; - case "-4000": - if ($index >=4000) - $index -= 4000; - break; - case "-2000": - if ($index >=2000) - $index -= 2000; - break; - case "-1000": - if ($index >=1000) - $index -= 1000; - break; - case "-500": - if ($index >=500) - $index -= 500; - break; - case "-100": - if ($index >=100) - $index -= 100; - break; - case "Vorheriges I-Frame": - $pindex = $index - 1; - $fp = popen ("/usr/local/bin/my/getpreviframe.pl $pindex","r"); - $i = fgets($fp,1000); - $index = chop ($i); - pclose ($fp); - break; - case "Naechstes I-Frame": - $index ++; - break; - case "+100": - $index += 100; - break; - case "+500": - $index += 500; - break; - case "+1000": - $index += 1000; - break; - case "+2000": - $index += 2000; - break; - case "+4000": - $index += 4000; - break; - case "+10000": - $index += 10000; - break; - } - -if ($test) - { - $fp = popen ("/usr/local/bin/my/schnitt3.pl $index","r"); - $i = fgets($fp,1000); - pclose ($fp); - $index = chop ($i); - } - -if ($name) - { - $fp = fopen ("cut","w"); - fputs ($fp,"$name\n"); - fclose ($fp); - } - -if ($cut) - { - $fp = fopen ("cut","a"); - fputs ($fp,"$index\n"); - fclose ($fp); - } - -$fp = popen ("/usr/local/bin/my/schnitt.pl $index","r"); -$i = fgets($fp,1000); -pclose ($fp); -$index = chop ($i); - -system ("/usr/local/bin/my/dumpframe /x2/temp/bild.m2v"); -system ("mv output.ppm /x2/temp"); -system ("touch /x2/temp/newpic"); -system ("killall sleep"); -?> -<form action="index.php" method="post"> -<input type=hidden name=level value="2"> -<input type=hidden name=dir value="<?=$dir?>"> -<input type=hidden name=index value=<?=$index?>> -<table width=90% align=center> -<tr> -<td><h1>Index <?=$index?></h1></td> -<td><h1>Dir: <?=$dir?></h1></td> -</tr> -</table> -<table width=80% align=center> -<tr> -<td><input type=submit name=cindex value="-10000"></td> -<td><input type=submit name=cindex value="-4000"></td> -<td><input type=submit name=cindex value="-2000"></td> -<td><input type=submit name=cindex value="-1000"></td> -<td><input type=submit name=cindex value="-500"></td> -<td><input type=submit name=cindex value="-100"></td> -<td><input type=submit name=cindex value="Vorheriges I-Frame"></td> -<td><input type=submit name=cindex value="Naechstes I-Frame"</td> -<td><input type=submit name=cindex value="+100"></td> -<td><input type=submit name=cindex value="+500"></td> -<td><input type=submit name=cindex value="+1000"></td> -<td><input type=submit name=cindex value="+2000"></td> -<td><input type=submit name=cindex value="+4000"></td> -<td><input type=submit name=cindex value="+10000"></td> -</tr> -</table> -<table> -<tr> -<td>Absoluter Index: <input type=text name=aindex size=6></td> -<td><input type=submit name=test value="Schnitt-Test"></td> -<td><input type=submit name=cut value="Mark"></td> -</form> -<form action="index.php" method="post"> -<input type=hidden name=level value="2"> -<input type=hidden name=dir value="<?=$dir?>"> -<input type=hidden name=index value=<?=$index?>> -<td>Titel: <input type=text name=name size=50 maxlength=255></td> -</form> -</tr> -</table> -<? -} -?> -</body> -</html> diff --git a/Tools/schnitt/lmplex b/Tools/schnitt/lmplex deleted file mode 100755 index 8cbb50f..0000000 --- a/Tools/schnitt/lmplex +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl - -### Calculate the number of CPUs we want to keep busy -open IN, "/proc/cpuinfo"; -$cpus = grep /processor.*:/, <IN>; -close IN; - -### This is a list of files to encode -@names = @ARGV; - -$dira = shift @names; -$dirb = shift @names; - -### This is the name of the encoder to use. -$coder = "/usr/local/bin/mplex "; -### - -### -### -### - -# Encode a single file -sub do_one { - my($m2v) = shift; - # Make mp3 from wav - $m2v =~ s/\.m2v$//; - - # In a subprocess, encode the file - printf "Multiplexing ${m2v}\n"; - unless($pid = fork) { - system ("$coder ${dira}/${m2v}.m2v ${dira}/${m2v}.mp2 ${dirb}/${m2v}.mpg"); - exit; - } -} - -# Go ahead and prefork $cpus encoders -foreach $i (0 .. $cpus-1) { - &do_one($names[0]) if ($names[0] ne ""); - shift @names; -} - -# Wait for the end of each encoder, start a new one... -foreach $i (@names) { - wait; - &do_one($i); -} - -# Wait for everything to close down. -while(wait > 0) { - ; -} diff --git a/Tools/schnitt/mv2 b/Tools/schnitt/mv2 deleted file mode 100755 index c27a9ff..0000000 --- a/Tools/schnitt/mv2 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Move files from DVB-Computer(s) to localmachine into $LOCALDIR -# - -LOCALDIR=/x1/video - -if [ ! "$UID" = 0 ]; then - if [ -d "$1" ]; then - if [ -f "$1/index.vdr" ]; then - cd $LOCALDIR - recdir=`echo "$1" | cut -d / -f4-` - mkdir -p "$recdir" - cd "$recdir" - dvbcomp=`echo "$1" | cut -d / -f2` - (echo cd "/video/video0/$recdir"; echo mget \*)| ftp -i $dvbcomp - cd $LOCALDIR - ssh $dvbcomp ls -Ls /video/video0/$recdir > /tmp/dvb - ls -Ls $recdir > /tmp/local - diff -u /tmp/dvb /tmp/local &> /dev/null && rm -rfv /$dvbcomp/video?/$recdir - rm /tmp/dvb - rm /tmp/local - rmdir --ignore-fail-on-non-empty `find /$dvbcomp/video?/ -type d -mindepth 1 | cut -d \/ -f-4 | grep -v temp | sort | uniq` - fi - fi -else - echo Not as root -fi - -/usr/local/bin/my/process_summary.pl diff --git a/Tools/schnitt/play b/Tools/schnitt/play deleted file mode 100755 index 0c43bff..0000000 --- a/Tools/schnitt/play +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -if [ "$1" != "" ]; then - vmount "$1" -fi -ssh dvb2 /usr/local/bin/my/novdr -sleep 1s -cat /mnt/*/* | buffer -b 1000 -S 1024 | ssh dvb2 play2 -ssh dvb2 rm /tmp/novdr -umount /mnt/* - diff --git a/Tools/schnitt/schnitt.pl b/Tools/schnitt/schnitt.pl deleted file mode 100755 index ac72a14..0000000 --- a/Tools/schnitt/schnitt.pl +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/perl - -require "/usr/local/bin/my/schnittcommon.pli"; - -if (!open (INDEX,"index.vdr")) - { - exit 1; - } -$index = $ARGV[0]; -&nextI; -$offset1 = $offset; -&readnext; -$off = $offset - $offset1; -close (FI); -$fi = sprintf ("%03d.vdr",$file); -open (FI,$fi); -open (FO,">bild"); -sysseek (FI,$offset1,0); -sysread (FI,$temp,200000); -syswrite (FO,$temp,200000); -close (FI); -close (FO); - -`cat bild | /usr/local/bin/avpes2mpeg > avpes`; -`/usr/local/bin/my/dumpframe avpes 1`; -#`/usr/local/bin/pes2av_pes bild | /usr/local/bin/pvademux /x2/temp bild`; -print "$index\n"; diff --git a/Tools/schnitt/schnitt2.pl b/Tools/schnitt/schnitt2.pl deleted file mode 100755 index d81b5fd..0000000 --- a/Tools/schnitt/schnitt2.pl +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/perl - -require "/usr/local/bin/my/schnittcommon.pli"; - -if (!open (INDEX,"index.vdr")) - { - print "Error opening index.vdr"; - exit 1; - } - -$index = $ARGV[0]; -&nextI; -#&readnext; -$file1 = $file; -$offset1 = $offset; -$index = $ARGV[1]; -&nextI; -#&readnext; -$file2 = $file; -$offset2 = $offset; - -if ($file1 == $file2) - { - $count = $offset2 - $offset1; - $cond = 0; - $size = 1024*1024; - $fi = sprintf ("%03d.vdr",$file); - open (FI,$fi); - sysseek (FI,$offset1,0); - while ($cond == 0) - { - if ($count > $size) - { - $read = sysread (FI,$data,$size); - print $data; - $count -= $size; - } - else - { - $read = sysread (FI,$data,$count); - print $data; - $cond = 1; - } - } - } -else - { - $count = $offset2; - $cond = 0; - $read = $size = 1024*1024; - $fi = sprintf ("%03d.vdr",$file1); - open (FI,$fi); - sysseek (FI,$offset1,0); - while ($read == $size) - { - $read = sysread (FI,$data,$size); - print $data; - } - close (FI); - - $file1++; - while ($file1 != $file2) - { - $fi = sprintf ("%03d.vdr",$file1); - open (FI,$fi); - $read = 1024*1024; - while ($read == $size) - { - $read = sysread (FI,$data,$size); - print $data; - } - close (FI); - $file1++; - } - - $fi = sprintf ("%03d.vdr",$file2); - open (FI,$fi); - while ($cond == 0) - { - if ($count > $size) - { - $read = sysread (FI,$data,$size); - print $data; - $count -= $size; - } - else - { - $read = sysread (FI,$data,$count); - print $data; - $cond = 1; - } - } - } diff --git a/Tools/schnitt/schnitt3.pl b/Tools/schnitt/schnitt3.pl deleted file mode 100755 index 7cc0f7f..0000000 --- a/Tools/schnitt/schnitt3.pl +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/perl - -require "/usr/local/bin/my/schnittcommon.pli"; - -open (INDEX,"index.vdr"); -$index = $ARGV[0]; -&nextI; - -$oldindex = $index; -$tempindex = $index; - -$add = -1; - -$fi = sprintf ("%03d.vdr",$file); -open (FI2,$fi); -open (FO,">test"); -sysseek (FI2,$offset,0); -sysread (FI2,$temp,3000000); -syswrite (FO,$temp,3000000); -close (FI2); -close (FO); -`/usr/local/bin/pvademux.old . test`; -if ( -s "test.mp2") - { - `rm test*`; - print "$index\n"; - exit 0; - } - -while (1) - { - if ($index == 0) - { - $add = 1; - } - if ($add = -1) - { - $index--; - &prevI; - } - else - { - nextI; - } - $fi = sprintf ("%03d.vdr",$file); - open (FI2,$fi); - open (FO,">test"); - sysseek (FI2,$offset,0); - sysread (FI2,$temp,3000000); - syswrite (FO,$temp,3000000); - close (FI2); - close (FO); - `/usr/local/bin/pvademux.old . test`; - if ( -s "test.mp2") - { - `rm test*`; - if ($index < 0) - { - $index *= -1; - } - print "$index\n"; - exit 0; - } - } diff --git a/Tools/schnitt/schnitt3.pl.new b/Tools/schnitt/schnitt3.pl.new deleted file mode 100755 index 04a6239..0000000 --- a/Tools/schnitt/schnitt3.pl.new +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/perl - -require "/usr/local/bin/my/schnittcommon.pli"; - -open (INDEX,"index.vdr"); - -$index = $ARGV[0]; -&nextI; - -$oldindex = $index; -$tempindex = $index; - -$add = -1; - -$fi = sprintf ("%03d.vdr",$file); -open (FI2,$fi); -open (FO,">test2"); -sysseek (FI2,$offset,0); -sysread (FI2,$temp,3000000); -syswrite (FO,$temp,3000000); -close (FI2); -close (FO); - -system ("pes2av_pes test2 > test 2>/dev/null"); -open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |"); - -@a=<PVA>; close PVA; -@b=split (/\s/,$a[2]); - -if (!($b[4] =~ /\-/) && $b[4] < 2000) - { - unlink <test*>; - print "$index\n"; - exit 0; - } - -while (1) - { - if ($index == 0) - { - $add = 1; - } - if ($add = -1) - { - $index--; - &prevI; - } - else - { - nextI; - } - $fi = sprintf ("%03d.vdr",$file); - open (FI2,$fi); - open (FO,">test2"); - sysseek (FI2,$offset,0); - sysread (FI2,$temp,3000000); - syswrite (FO,$temp,3000000); - close (FI2); - close (FO); - -system ("/usr/local/bin/pes2av_pes test2 > test 2>/dev/null"); -open (PVA,"/usr/local/bin/pvademux.old . test 2>&1 |"); - -@a=<PVA>; close PVA; -@b=split (/\s/,$a[2]); - -if (!($b[4] =~ /\-/) && $b[4] < 2000) - { - unlink <test*>; - if ($index < 0) - { - $index *= -1; - } - print "$index\n"; - exit 0; - } -} diff --git a/Tools/schnitt/schnitt4.pl b/Tools/schnitt/schnitt4.pl deleted file mode 100755 index 75f2ad1..0000000 --- a/Tools/schnitt/schnitt4.pl +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/perl - -open (FI,$ARGV[0]) or die "Kann Input-Datei nicht oeffnen"; -$count = 1; - -while (<FI>) - { - chomp; - $char = sprintf ("%c",$count + 96); - print "Cutting from/to $_ into /x2/clips/$char\n"; - system ("/usr/local/bin/my/schnitt2.pl $_ > /x2/clips/$char"); - $count++; - } diff --git a/Tools/schnitt/schnitt5.pl b/Tools/schnitt/schnitt5.pl deleted file mode 100755 index 7626ab5..0000000 --- a/Tools/schnitt/schnitt5.pl +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/perl -require "/usr/local/bin/my/schnittcommon.pli"; - -open (INDEX,"index.vdr"); -$index = $ARGV[0] - 15000; -&nextI; - -$file1 = $file; - -$index += 30000; -&nextI; - -$file2 = $file; - -print "$file1 $file2\n"; - diff --git a/Tools/schnitt/schnitt6.pl b/Tools/schnitt/schnitt6.pl deleted file mode 100755 index 92d9eb4..0000000 --- a/Tools/schnitt/schnitt6.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl - -open (FI,"a"); - -while (<FI>) -{ - open (SCH,"/usr/local/bin/my/schnitt5.pl $_|"); - $files = <SCH>; - chomp $files; - ($a,$b) = split (/\s/,$files); - $files[$a] = 1; - $files[$b] = 1; - close (SCH); -} - -while (<0*.vdr>) -{ - $_ =~ /\d(\d\d)\.vdr/; - if ($files[$1]) - { - print "Keeping $1\n"; - } - else - { - print "Deleting $_\n"; - unlink $_; - } -} - -close (FI); diff --git a/Tools/schnitt/schnittcommon.pli b/Tools/schnitt/schnittcommon.pli deleted file mode 100755 index f221f41..0000000 --- a/Tools/schnitt/schnittcommon.pli +++ /dev/null @@ -1,64 +0,0 @@ -sub nextI - { - if (!$size) - { - $size = -s INDEX; - } - local ($a,$b,$c,$dummy); - $cond = 0; - seek (INDEX,$index * 8,0); - - while ($cond == 0) - { - &readnext; - if ($frame == 1) - { - $cond = 1; - } - else - { - $index++; - if ($index > ($size/8-1)) - { - $index = $size/8-1; - &prevI; - print "$index\n"; - exit 1; - } - } - } - } - -sub readnext - { - read (INDEX,$a,4); - read (INDEX,$b,1); - read (INDEX,$c,1); - read (INDEX,$dummy,2); - $offset = unpack ("L",$a); - $frame = unpack ("C",$b); - $file = unpack ("C",$c); - } - -sub prevI - { - local ($a,$b,$c,$dummy); - $cond = 0; - seek (INDEX,$index * 8,0); - - while ($cond == 0) - { - &readnext; - if ($frame == 1) - { - $cond = 1; - } - else - { - $index--; - seek (INDEX,$index * 8,0); - } - } - } - -1; diff --git a/Tools/schnitt/show b/Tools/schnitt/show deleted file mode 100755 index bfcc58a..0000000 --- a/Tools/schnitt/show +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd /x2/temp -while true -do - if [ -f newpic ]; then - killall xli - rm -f newpic - xli output000.ppm & - fi -sleep 24h -done diff --git a/Tools/schnitt/unsort b/Tools/schnitt/unsort deleted file mode 100755 index 83adfb6..0000000 --- a/Tools/schnitt/unsort +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/perl - -while (<>) -{ - $h{$_}=1; -} - -foreach $key (sort shuffle keys %h) -{ - print $key; -} - -sub shuffle { - $ran = rand(1); - - if ($ran > 0.5) - { - return -1; - } - else - { - return 1; - } -} - diff --git a/Tools/schnitt/vdr-remote.pl b/Tools/schnitt/vdr-remote.pl deleted file mode 100755 index 32d408e..0000000 --- a/Tools/schnitt/vdr-remote.pl +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use Socket; - -my ($dest, $port, $iaddr, $paddr, $proto, $line); - -$dest = "localhost"; -$port = "2001"; - -$iaddr = inet_aton($dest) || Error("no host: $dest"); -$paddr = sockaddr_in($port, $iaddr); - -$proto = getprotobyname('tcp'); -socket(SOCK, PF_INET, SOCK_STREAM, $proto) || Error("socket: $!"); -connect(SOCK, $paddr) || Error("connect: $!"); -select (SOCK); $| = 1; -$a=<SOCK>; - -for (;;) - { - open (FI,"/tmp/vdr-keys"); - while (<FI>) - { - chomp; - print "$_\r\n"; - $a=<SOCK>; - } - close (FI); - } - -print "quit\r\n"; -$a=<SOCK>; -close (SOCK) || Error("close: $!"); - -sub Error -{ - print STDERR "@_\n"; - exit 0; -} diff --git a/Tools/schnitt/vdr2 b/Tools/schnitt/vdr2 deleted file mode 100755 index 96557bf..0000000 --- a/Tools/schnitt/vdr2 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -irpty ~/.lircrc-vdr -- vdr -c /home/ms/.vdr -v /video/video0 diff --git a/Tools/schnitt/vmount b/Tools/schnitt/vmount deleted file mode 100755 index ab16e45..0000000 --- a/Tools/schnitt/vmount +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -count=1 -cond=0 - -if [ -f "$1" ]; then - mount "$1" /mnt/1 -o loop - cond=1 -else - while [ "$cond" != "1" ] - do - if [ -f "$1$count" ]; then - mount "$1$count" /mnt/$count -o loop - else - cond=1 - fi - let count=count+1 - done -fi |