From 6b6dc5d0d724e083ef7f23d1f958e2ae94f312c2 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Fri, 31 Dec 2004 09:04:46 +0000 Subject: [PATCH] Corrections and minor fixes to use new geometry spec; couple of new test cases git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@594 d19143bc-622f-0410-bfdd-b5b2a6649095 --- demo/demo.ini | 2 ++ demo/mlt_attributes | 6 ++++++ demo/mlt_news | 18 +++++++++--------- demo/mlt_slideshow | 2 +- demo/mlt_slideshow_black | 3 +++ demo/mlt_squeeze | 8 ++++---- demo/mlt_ticker | 3 +-- demo/mlt_watermark | 2 +- 8 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 demo/mlt_attributes create mode 100644 demo/mlt_slideshow_black diff --git a/demo/demo.ini b/demo/demo.ini index 128821e..9310326 100644 --- a/demo/demo.ini +++ b/demo/demo.ini @@ -24,3 +24,5 @@ mlt_lcut L Cut clip1.dv,clip2.dv mlt_fade_black Fade from/to black/silence clip3.mpeg mlt_push Push wipe clip1.mpeg, clip2.mpeg mlt_ticker Ticker tape clip1.dv +mlt_attributes Attributes clip1.dv +mlt_slideshow_black Composite slideshow Scotland diff --git a/demo/mlt_attributes b/demo/mlt_attributes new file mode 100644 index 0000000..ceba23d --- /dev/null +++ b/demo/mlt_attributes @@ -0,0 +1,6 @@ +inigo clip1.dv \ +meta.attr.location=1 meta.attr.location.markup="Location" \ +meta.attr.exclusive=1 meta.attr.exclusive.markup="Exclusive" \ +meta.attr.special=1 meta.attr.special.markup="Special" \ +meta.attr.super=1 meta.attr.super.0="Line 1" meta.attr.super.1="Line 2" \ +$* diff --git a/demo/mlt_news b/demo/mlt_news index 75bbab1..4940ee8 100644 --- a/demo/mlt_news +++ b/demo/mlt_news @@ -1,19 +1,19 @@ inigo \ colour:black out=199 \ -track \ -hold:clip1.mpeg out=99 clip1.mpeg \ +clip1.dv in=0 out=0 -repeat 99 clip1.dv \ -track \ -clip2.mpeg out=199 \ +clip2.dv out=199 \ -track \ -pango: text=" Breaking News +pango: text=" Breaking News MLT Rocks India" bgcolour=0xff000080 out=149 \ -pango: text=" Breaking News +pango: text=" Breaking News MLT Rocks the World" bgcolour=0xff000080 out=349 \ -transition mix:1 a_track=0 b_track=2 in=0 out=149 \ -transition mix:1 a_track=0 b_track=1 in=150 out=199 \ --transition composite:50%,15%:40%x40% a_track=0 b_track=1 in=0 out=174 \ --transition composite:10%,15%:40%x40% a_track=0 b_track=2 in=0 out=199 \ --transition composite:50%,15%:40%x40% end=3%,2%:94%x96% a_track=0 b_track=1 distort=true in=174 out=199 \ --transition composite:10%,65%:90%x20% a_track=0 b_track=3 in=0 out=199 \ --transition composite:10%,65%:90%x20% a_track=1 b_track=3 in=200 out=499 \ +-transition composite geometry=50%,15%:37.5%x40% a_track=0 b_track=1 in=0 out=174 \ +-transition composite geometry=10%,15%:37.5%x40% a_track=0 b_track=2 in=0 out=199 \ +-transition composite geometry="50%,15%:37.540%x40%;-1=0%,0%:100%x100%" a_track=0 b_track=1 in=174 out=199 distort=1 \ +-transition composite geometry=10%,65%:90%x20% a_track=0 b_track=3 in=0 out=199 \ +-transition composite geometry=10%,65%:90%x20% a_track=1 b_track=3 in=200 out=499 \ $* diff --git a/demo/mlt_slideshow b/demo/mlt_slideshow index db870b7..efe0d06 100644 --- a/demo/mlt_slideshow +++ b/demo/mlt_slideshow @@ -1,4 +1,4 @@ inigo \ Scotland/.all.jpg ttl=75 \ --filter luma:luma1.pgm luma.softness=0.1 \ +-filter luma:luma1.pgm luma.softness=0.1 luma.invert=0 \ $* diff --git a/demo/mlt_slideshow_black b/demo/mlt_slideshow_black new file mode 100644 index 0000000..a9a80f0 --- /dev/null +++ b/demo/mlt_slideshow_black @@ -0,0 +1,3 @@ +inigo Scotland/.all.jpg ttl=250 \ +-filter watermark:colour:black reverse=1 composite.geometry="15%,15%:10%,10%;0.0625=0,0:100%x100%;.4375=;250=70%,70%:10%x10%;251=15%,15%:10%,10%;.5625=0,0:100%x100%;-.0625=;500=70%,70%:10%x10%" composite.cycle=500 composite.fill=1 composite.valign=c composite.halign=c \ +$* diff --git a/demo/mlt_squeeze b/demo/mlt_squeeze index 839efe9..a56780c 100644 --- a/demo/mlt_squeeze +++ b/demo/mlt_squeeze @@ -2,8 +2,8 @@ inigo \ clip1.dv out=124 clip2.dv out=149 clip3.dv in=75 out=224 clip1.dv \ -track \ -blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \ --group progressive=1 distort=true \ --transition composite:0%,0%:100%x100% key[25]=50%,0%:5%x100% end=0%,0%:100%x100% a_track=1 b_track=0 in=100 out=149 \ --transition composite:0%,0%:100%x100% key[25]=0%,50%:100%x5% end=0%,0%:100%x100% a_track=1 b_track=0 in=250 out=299 \ --transition composite:0%,0%:100%x100% key[25]=100%,0%:5%x100% end=0%,0%:100%x100% a_track=1 b_track=0 in=400 out=449 \ +-group progressive=1 distort=1 \ +-transition composite geometry="0%,0%:100%x100%;25=50%,0%:5%x100%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=100 out=149 \ +-transition composite geometry="0%,0%:100%x100%;25=0%,50%:100%x5%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=250 out=299 \ +-transition composite geometry="0%,0%:100%x100%;25=100%,0%:5%x100%;-1=0%,0%:100%x100%" a_track=1 b_track=0 in=400 out=449 \ $* diff --git a/demo/mlt_ticker b/demo/mlt_ticker index 827a94a..f6a8329 100644 --- a/demo/mlt_ticker +++ b/demo/mlt_ticker @@ -6,9 +6,8 @@ colour:black out=299 \ "+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog..txt" \ out=299 \ -transition \ -composite a_track=0 b_track=1 out=299 titles=1 \ +composite a_track=0 b_track=1 out=299 distort=1 \ start=0,70%:100%x64:100 \ -distort=true \ -transition \ composite a_track=0 b_track=2 out=299 titles=1 \ start=100%,70%:999%x20% \ diff --git a/demo/mlt_watermark b/demo/mlt_watermark index 7f361dd..7c8902b 100644 --- a/demo/mlt_watermark +++ b/demo/mlt_watermark @@ -2,5 +2,5 @@ inigo \ clip2.dv out=1000 \ -track \ watermark1.png out=1000 \ --transition composite distort=true in=0 out=1000 a_track=0 b_track=1 \ +-transition composite fill=1 in=0 out=1000 a_track=0 b_track=1 \ $* -- 1.7.4.4