From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Fri, 12 Mar 2004 20:52:35 +0000 (+0000)
Subject: some demo updates
X-Git-Url: https://git.sesse.net/?p=mlt;a=commitdiff_plain;h=556c56d17c6d94ee542ae870f9c0d48c181a1561

some demo updates


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@210 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/demo/circle.png b/demo/circle.png
new file mode 100644
index 00000000..b804f5e8
Binary files /dev/null and b/demo/circle.png differ
diff --git a/demo/circle.svg b/demo/circle.svg
new file mode 100644
index 00000000..2cc1ac5b
--- /dev/null
+++ b/demo/circle.svg
@@ -0,0 +1 @@
+<svg width='300' height='300'><circle cx='150' cy='150' r='150' fill='black'/></svg>
diff --git a/demo/consumers.ini b/demo/consumers.ini
index d42fbc5c..11937bb2 100644
--- a/demo/consumers.ini
+++ b/demo/consumers.ini
@@ -1,7 +1,10 @@
 SDL Default						sdl
 SDL Low Latency					sdl buffer=1 rescale=none
 SDL Half D1						sdl:360x288 buffer=1 rescale=nearest
+SDL Progressive					sdl progressive=1
 Westley to Terminal				westley
 Westley to File					westley:
 Mainconcept DV to /dev/dv1394	mcdv:/dev/dv1394 rescale=nearest buffer=25
 libdv to /dev/dv1394			libdv:/dev/dv1394 rescale=nearest buffer=25
+BlueFish PAL					bluefish
+BlueFish NTSC					bluefish:NTSC
diff --git a/demo/luma1.pgm b/demo/luma1.pgm
index 4d7b0fcd..64433aa8 100644
Binary files a/demo/luma1.pgm and b/demo/luma1.pgm differ
diff --git a/demo/mlt_bouncy_ball b/demo/mlt_bouncy_ball
index 64dea35b..31fadb76 100644
--- a/demo/mlt_bouncy_ball
+++ b/demo/mlt_bouncy_ball
@@ -1,9 +1,9 @@
 inigo \
-clip3.dv \
+clip3.mpeg \
 -track \
-clip1.dv \
+clip1.mpeg \
 -transition \
-region:watermark1.png \
+region:circle.png \
 composite.start=10%,10%:20%x20% \
 composite.key[33]=30%,70%:25%x25% \
 composite.key[66]=70%,30%:15%x15% \
diff --git a/demo/mlt_composite_transition b/demo/mlt_composite_transition
index 80998f5f..cc38ec84 100644
--- a/demo/mlt_composite_transition
+++ b/demo/mlt_composite_transition
@@ -2,6 +2,6 @@ inigo \
 clip1.dv out=74 \
 -track \
 -blank 49 clip2.mpeg \
--transition composite:57%,10%:33%x33% end=0%,0%:100%x100% distort=true in=50 out=74 a_track=0 b_track=1 \
+-transition composite:57%,10%:33%x33% end=0%,0%:100%x100% progressive=1 distort=true in=50 out=74 a_track=0 b_track=1 \
 -transition mix:-1 in=50 out=74 a_track=0 b_track=1 \
 $*
diff --git a/demo/mlt_fade_in_and_out b/demo/mlt_fade_in_and_out
index 2ab3db48..fbe1fa35 100644
--- a/demo/mlt_fade_in_and_out
+++ b/demo/mlt_fade_in_and_out
@@ -2,7 +2,7 @@ inigo \
 clip1.dv out=74 -blank 99 clip3.dv in=25 \
 -track \
 -blank 49 clip2.mpeg out=149 \
--transition luma:luma1.pgm in=50 out=74 a_track=0 b_track=1 \
+-transition luma in=50 out=74 a_track=0 b_track=1 \
 -transition luma in=175 out=199 a_track=0 b_track=1 reverse=1 \
 -transition mix:-1 in=50 out=74 a_track=0 b_track=1 \
 -transition mix:-1 in=175 out=199 a_track=0 b_track=1 reverse=1 \
diff --git a/demo/mlt_obscure b/demo/mlt_obscure
index 1e0e3256..a8f9a36f 100644
--- a/demo/mlt_obscure
+++ b/demo/mlt_obscure
@@ -1,5 +1,5 @@
 inigo \
-clip2.dv \
+clip2.mpeg \
 -filter obscure:25%,25%:25%x25% in=0 out=68 \
--filter obscure:55%,25%:12%x50% in=68 out=200 \
+-filter region:circle.png filter=obscure composite.start=55%,25%:12%x50% in=68 out=200 \
 $*
diff --git a/demo/mlt_title_over_gfx b/demo/mlt_title_over_gfx
index cdc49960..ef9c55ae 100644
--- a/demo/mlt_title_over_gfx
+++ b/demo/mlt_title_over_gfx
@@ -12,6 +12,7 @@ inigo \
 		b_track=1 \
 		key[24]=0%,75%:100%x20%:100 \
 		key[-25]=0%,75%:100%x20%:100 \
+		luma=luma1.pgm \
 		end=0%,75%:100%x20%:0 \
 		distort=1 \
 -transition \
diff --git a/demo/mlt_titleshadow_watermark b/demo/mlt_titleshadow_watermark
index 68407968..5c359a3a 100644
--- a/demo/mlt_titleshadow_watermark
+++ b/demo/mlt_titleshadow_watermark
@@ -1,10 +1,10 @@
 inigo \
-clip3.dv \
+clip3.dv in=99 \
 -track "+hello~world.txt" align=1 out=1000 \
 -track "+hello~world.txt" align=1 out=1000 fgcolour=0x000000ff \
 -track watermark1.png out=1000 \
 -filter greyscale track=3 \
--transition composite:41%,11%:100%x100%:50 out=1000 a_track=0 b_track=2 \
--transition composite:40%,10%:100%x100% out=1000 a_track=0 b_track=1 \
+-transition composite:21%,11%:100%x100%:50 end=61%,41%:100%x100% out=99 a_track=0 b_track=2 \
+-transition composite:20%,10%:100%x100% end=60%,40%:100%x100% out=99 a_track=0 b_track=1 \
 -transition composite:85%,80%:10%x10%:30 out=1000 a_track=0 b_track=3 \
 $*
diff --git a/demo/mlt_voiceover b/demo/mlt_voiceover
index 57b4d1ca..fd045652 100644
--- a/demo/mlt_voiceover
+++ b/demo/mlt_voiceover
@@ -16,28 +16,23 @@ inigo \
 	a_track=0 \
 	b_track=1 \
 -transition \
-	mix:-1 \
+	mix:0.0 \
+	end=0.6 \
 	in=75 \
 	out=99 \
 	a_track=0 \
 	b_track=2 \
 -transition \
-	mix:1 \
+	mix:0.6 \
 	in=100 \
 	out=299 \
 	a_track=0 \
-	b_track=1 \
--transition \
-	mix:1 \
-	in=100 \
-	out=299 \
-	a_track=1 \
 	b_track=2 \
 -transition \
-	mix:-1 \
+	mix:0.6 \
+	end=0.0 \
 	in=300 \
 	out=324 \
 	a_track=0 \
 	b_track=2 \
-	reverse=1 \
 $*