demo mods for reversed tracks

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@239 d19143bc-622f-0410-bfdd-b5b2a6649095
agpanarin · Mar 24, 2004 · 3c42556 · 3c42556
1 parent 3531bc4
commit 3c42556
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 34 deletions.
diff --git a/demo/consumers.ini b/demo/consumers.ini
@@ -1,6 +1,6 @@
 SDL Default						sdl
-SDL Low Latency					sdl buffer=1 rescale=none
-SDL Half D1						sdl:360x288 buffer=1 rescale=nearest
+SDL Half D1						sdl:360x288 rescale=nearest
+SDL High Latency				sdl buffer=12 rescale=none
 SDL Progressive					sdl progressive=1
 Westley to Terminal				westley
 Westley to File					westley:

diff --git a/demo/luma1.pgm b/demo/luma1.pgm
diff --git a/demo/mlt_clock_in_and_out b/demo/mlt_clock_in_and_out
@@ -2,6 +2,6 @@ inigo \
 clip2.dv in=100 out=174 -blank 99 clip3.dv in=100 \
 -track \
 -blank 49 clip3.mpeg in=100 out=249 \
--transition luma:luma1.pgm in=50 out=74 a_track=0 b_track=1 \
--transition luma:luma1.pgm in=175 out=199 a_track=0 b_track=1 reverse=1 \
+-transition luma:luma1.pgm softness=0.5 in=50 out=74 a_track=0 b_track=1 \
+-transition luma:luma1.pgm softness=0.2 in=175 out=199 a_track=0 b_track=1 reverse=1 \
 $*
diff --git a/demo/mlt_fade_black b/demo/mlt_fade_black
@@ -1,7 +1,7 @@
 inigo \
 clip3.mpeg in=100 out=299 \
 -track \
-colour:black \
+colour:black out=49 -blank 99 colour:black out=49 \
 -transition \
 luma in=0 out=49 a_track=0 b_track=1 reverse=1 \
 -transition \

diff --git a/demo/mlt_my_name_is b/demo/mlt_my_name_is
@@ -1,9 +1,9 @@
 inigo \
 clip3.dv \
 -track \
-"+My name is Inigo Montoya.txt" out=99 -blank 49 "+Prepare to die!.txt" \
+"+My name is Inigo Montoya.txt" out=99 -blank 49 "+Prepare to die!.txt" out=99 \
 -track \
--blank 74 "+You killed my father.txt" out=99 \
+-blank 74 "+You killed my father.txt" out=74 \
 -transition composite:50%,20%:5%x4% end=10%,20%:80%x12% fill=true halign=centre valign=centre in=0 out=99 a_track=0 b_track=1 \
 -transition composite:0%,70%:100%x10% end=100%,70%:100%x10% in=75 out=149 a_track=0 b_track=2 \
 -transition composite:25%,25%:50%x50%! in=150 out=249 a_track=0 b_track=1 \

diff --git a/demo/mlt_news b/demo/mlt_news
@@ -1,7 +1,7 @@
 inigo \
 colour:black out=199 \
 -track \
-hold:avformat:clip1.mpeg out=149 clip1.mpeg \
+hold:clip1.mpeg out=149 clip1.mpeg \
 -track \
 clip2.mpeg out=199 \
 -track \

diff --git a/demo/mlt_squeeze b/demo/mlt_squeeze
@@ -1,8 +1,8 @@
 inigo \
--blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \
--track \
 clip1.dv out=124 clip2.dv out=149 clip3.dv in=75 out=224 clip1.dv \
--transition composite:0%,0%:100%x100% key[25]=50%,0%:5%x100% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=100 out=149 \
--transition composite:0%,0%:100%x100% key[25]=0%,50%:100%x5% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=250 out=299 \
--transition composite:0%,0%:100%x100% key[25]=100%,0%:5%x100% key[26]=0%,0%:5%x100% end=0%,0%:100%x100% distort=true a_track=0 b_track=1 in=400 out=449 \
+-track \
+-blank 99 colour:black out=49 -blank 99 colour:black out=49 -blank 99 colour:black out=49 \
+-transition composite:0%,0%:100%x100% key[25]=50%,0%:5%x100% end=0%,0%:100%x100% distort=true 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% distort=true a_track=1 b_track=0 in=250 out=299 \
+-transition composite:0%,0%:100%x100% key[25]=100%,0%:5%x100% key[26]=0%,0%:5%x100% end=0%,0%:100%x100% distort=true a_track=1 b_track=0 in=400 out=449 \
 $*
diff --git a/demo/mlt_title_over_gfx b/demo/mlt_title_over_gfx
@@ -1,9 +1,16 @@
 inigo \
 	clip1.dv \
--track \
+-track cg=1 \
 	watermark1.png out=9999 \
--track \
+-track cg=1 \
 	"+title over gfx.txt" fgcolour=0x000000ff \
+-transition \
+	composite start=30%,20%:40%x60% \
+		in=50 \
+		out=199 \
+		a_track=1 \
+		b_track=2 \
+		fill=true \
 -transition \
 	composite:0%,75%:100%x20%:0 \
 		in=50 \
@@ -15,11 +22,4 @@ inigo \
 		luma=luma1.pgm \
 		end=0%,75%:100%x20%:0 \
 		distort=1 \
--transition \
-	composite start=30%,20%:40%x60% \
-		in=50 \
-		out=199 \
-		a_track=1 \
-		b_track=2 \
-		fill=true \
 $*
diff --git a/demo/mlt_voiceover b/demo/mlt_voiceover
@@ -1,20 +1,11 @@
 inigo \
-	clip1.dv out=149 \
-	clip2.mpeg \
--track "+voice over demo.txt" \
-		out=299 \
+clip1.dv out=149 clip2.mpeg \
+-hide-track "+voice over demo.txt" \
 		font="Sans Bold 72" \
 		fgcolour=0x00000000 \
 		bgcolour=0xff9933aa \
 		pad=10 \
--track music1.ogg \
--transition \
-	composite:0%,80%:100%x20% \
-	distort=1 \
-	in=100 \
-	out=299 \
-	a_track=0 \
-	b_track=1 \
+-hide-audio music1.ogg \
 -transition \
 	mix:0.0 \
 	end=0.6 \
@@ -35,4 +26,11 @@ inigo \
 	out=324 \
 	a_track=0 \
 	b_track=2 \
+-transition \
+	composite:0%,80%:100%x20% \
+	distort=1 \
+	in=100 \
+	out=299 \
+	a_track=0 \
+	b_track=1 \
 $*