Compare commits

..

No commits in common. "ff916c434c966667983e99359dd81edade420208" and "a4b7f5c21c8166a84fe7e99f00eea055dc6a2758" have entirely different histories.

5 changed files with 22 additions and 78 deletions

8
.gitignore vendored
View File

@ -67,4 +67,12 @@ Fonderie/singlepass
Fonderie/crapdef.h Fonderie/crapdef.h
Fonderie/crapstr.h Fonderie/crapstr.h
experiment/assemblage
experiment/extracteur
experiment/*.fimg
experiment/*.pnm
experiment/*.o
experiment/muxplanes
experiment/movepixels
experiment/tcache

View File

@ -119,7 +119,7 @@ fprintf(stderr, "\n");
globfree(&globbuf); globfree(&globbuf);
fimg_destroy(&image); fimg_destroy(&image);
// single_print_state("end of run", 0); single_print_state("end of run", 0);
elapsed = fimg_timer_get(0); elapsed = fimg_timer_get(0);
fprintf(stderr, "%s: %ld frames, elapsed %.3f s, %.3f fps\n", fprintf(stderr, "%s: %ld frames, elapsed %.3f s, %.3f fps\n",

1
contrib/.gitignore vendored
View File

@ -3,7 +3,6 @@ fimg2povhf
demo_fmorph demo_fmorph
toto toto
core
*.tga *.tga
*.png *.png

View File

@ -6,14 +6,12 @@ SPASS="../Fonderie/singlepass"
SRCDIR=$HOME"/Essais/PS-eye/frames/" SRCDIR=$HOME"/Essais/PS-eye/frames/"
DSTPOL=$HOME"/TMP/" DSTPOL=$HOME"/TMP/"
echo "source = " $SRCDIR echo "source = " $SRCDIR " spool = " $DSTPOL
echo "spool = " $DSTPOL
LINKFARM=$DSTPOL"LinkFarm" LINKFARM=$DSTPOL"LinkFarm"
echo "linkfarm = " $LINKFARM echo "linkfarm = " $LINKFARM
# VIDZ="$HOME/BU/vrac/all_effects.mp4" VIDZ="$HOME/BU/vrac/all_effects.mp4"
VIDZ="foo.mp4"
echo "lolvidz = " $VIDZ echo "lolvidz = " $VIDZ
LINKNUM=0 LINKNUM=0
@ -26,7 +24,7 @@ local effect=$1
local ddir=$2 local ddir=$2
figlet "$effect" ; echo figlet "$effect" ; echo
echo " files to ===> " $ddir echo " ===> " $ddir
rm -f $ddir/?????.png rm -f $ddir/?????.png
@ -37,29 +35,6 @@ $SPASS -F $effect \
} }
# --------------------------------------------
insert_blank()
{
local count=$1
local imgname="$DSTPOL/blank.fimg"
if [ ! -r $imgname ] ; then
mkfimg -v -t black $imgname 640 480
fimg2png -v $imgname $DSTPOL/blank.png
echo "blankimage done" | boxes
# display $DSTPOL/blank.png &
# exit
fi
for foo in $(seq 0 $count)
do
linkname=$(printf "%s/L%05d.png" $LINKFARM $LINKNUM)
ln --force --symbolic $DSTPOL/blank.png $linkname
# file $linkname
LINKNUM=$(( LINKNUM + 1 ))
done
}
# -------------------------------------------- # --------------------------------------------
make_the_linkfarm_from() make_the_linkfarm_from()
@ -72,13 +47,13 @@ echo "====== Linkfarming from " $sdir \
mogrify \ mogrify \
-font Utopia-Bold \ -font Utopia-Bold \
-pointsize 64 \ -pointsize 90 \
-kerning 9 \ -kerning 9 \
-fill Gray90 \ -fill Gray80 \
-stroke Gray10 \ -stroke Gray20 \
-strokewidth 2 \ -strokewidth 3 \
-gravity South-East \ -gravity South-East \
-annotate +30+20 $effname \ -annotate +45+125 $effname \
$sdir/*.png $sdir/*.png
for img in $(ls -1 $sdir/?????.png) for img in $(ls -1 $sdir/?????.png)
@ -92,16 +67,14 @@ do
LINKNUM=$(( LINKNUM + 1 )) LINKNUM=$(( LINKNUM + 1 ))
done done
echo " linkfarming done" echo "linkfarming done"
} }
# -------------------------------------------- # --------------------------------------------
# traite tous les effets # traite tous les effets
do_all_the_effects() do_all_the_effects()
{ {
EFFECTS=$( $SPASS -L | sort ) EFFECTS=$( $SPASS -L | sort --reverse )
banner 'FULL RUN'
for effect in $EFFECTS for effect in $EFFECTS
do do
@ -117,40 +90,19 @@ do
do_an_effect_pass $effect $DDIR do_an_effect_pass $effect $DDIR
make_the_linkfarm_from $effect $DDIR make_the_linkfarm_from $effect $DDIR
insert_blank 30
done done
} }
# --------------------------------------------
debug_run()
{
local eff=$1
local DDIR=$DSTPOL"/$eff"
banner 'DEBUG RUN'
echo "DDIR = " $DDIR
do_an_effect_pass $eff $DDIR
make_the_linkfarm_from $eff $DDIR
}
# -------------------------------------------- # --------------------------------------------
# MAIN # MAIN
echo rm -v -f $LINKFARM/L?????.png
rm -v -f $LINKFARM/L*.png ; echo
insert_blank 30
# debug_run 'rndblks'
do_all_the_effects do_all_the_effects
banner 'encoding' banner encoding
ffmpeg -nostdin \ ffmpeg -nostdin \
-loglevel warning \
-y -r 30 -f image2 -i ${LINKFARM}/L%05d.png \ -y -r 30 -f image2 -i ${LINKFARM}/L%05d.png \
-metadata artist='---[ tTh ]---' \ -metadata artist='---[ tTh ]---' \
-metadata title='---[ All the 'Fonderie' effects ]---' \ -metadata title='---[ All the 'Fonderie' effects ]---' \
@ -158,6 +110,3 @@ ffmpeg -nostdin \
-c:v libx264 -pix_fmt yuv420p \ -c:v libx264 -pix_fmt yuv420p \
$VIDZ $VIDZ
echo " encoding of " $VIDZ " . . . . . [done]"

12
experiment/.gitignore vendored
View File

@ -1,12 +0,0 @@
*.fimg
*.o
*.pnm
assemblage
extracteur
fimg2obj
mnt
movepixels
muxplanes
tcache