demo mods for reversed tracks

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

diff --git a/demo/consumers.ini b/demo/consumers.ini
index 16720ffcdf101ee7fcddd1bade05e6468b18421c..7cd55e5050df6f645b974b6d5c8a0fc11d1c25ab 100644 (file)
--- 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
index 9d42359ec6fc479162c288656dd472730bc34c78..ac689e5bd7b1afea69b2619d440722853caa1405 100644 (file)
Binary files a/demo/luma1.pgm and b/demo/luma1.pgm differ

diff --git a/demo/mlt_clock_in_and_out b/demo/mlt_clock_in_and_out
index 969e5e26c42a849ed11f3c310d7bb90cdd42c549..f19dd5ef9912975f5d356228fc4eb06c98f634e7 100644 (file)
--- 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
index 87646c3bab0afaa2656eb3b22d35267964aa79c4..60e9028e8cd89d3997bcb798eb89b61710dce115 100644 (file)
--- 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
index eecbc04457dc121ee51ea7388cf923dd65d3470e..a0ad96e7d8f9829adf314eb3fe06b89c60768202 100644 (file)
--- 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
index e9a43ec74e195593b61cbee15a1e389376f99f3c..3fa4603a9d4647f3fc16974ab0249d0b5a2c3216 100644 (file)
--- 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
index 82e93ee9bbc47ca96725a262e1ace1122aaf41f3..efe99ebcb80e8bc7d0d2e7aeaceb0831efec35d2 100644 (file)
--- 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
index ef9c55ae1b9c07373594f4295eb8c0ef1e468de9..94248d310a928b68320a7ff9e04ddbff5cdee79d 100644 (file)
--- 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
index 94f1b0d2818dfe6adc1537b75be25d0ffd71f0ed..980cf3812cef6b2e09ee560d585be5bcac4dbb20 100644 (file)
--- 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 \
 $*