Luma and composite fixes

[mlt] / src / modules / data_fx.properties

diff --git a/src/modules/data_fx.properties b/src/modules/data_fx.properties
index 8010af0ee3ce56eaf2c32cb40d4c4dd23dbbd6bd..49368abf4dce3a3b71dd8fd55ab52ee30096d9b7 100644 (file)
--- a/src/modules/data_fx.properties
+++ b/src/modules/data_fx.properties
@@ -18,231 +18,233 @@
 #
 
 titles=region
-titles.description=Titles
-titles.properties.markup=filter[1].producer.markup
-titles.type.markup=text
-titles.period=2
-titles.properties.length[0]=filter[0].composite.out
-titles.properties.length[1]=filter[1].composite.out
-titles.composite.geometry=5%,70%:90%x20%
-titles.filter[0]=watermark
-titles.filter[0].resource=colour:0x000000
-titles.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
-titles.filter[0].composite.titles=1
-titles.filter[1]=watermark
-titles.filter[1].resource=pango:
-titles.filter[1].producer.markup=Shotcut
-titles.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
-titles.filter[1].composite.titles=1
+.description=Titles
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=5%,70%:90%x20%
+.filter[0]=watermark
+.filter[0].resource=colour:0x000000
+.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=Shotcut
+.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
 
 #
 # The top titles filter definition
 #
 
 top-titles=region
-top-titles.description=Top Titles
-top-titles.properties.markup=filter[1].producer.markup
-top-titles.type.markup=text
-top-titles.period=2
-top-titles.properties.length[0]=filter[0].composite.out
-top-titles.properties.length[1]=filter[1].composite.out
-top-titles.composite.geometry=5%,5%:90%x20%
-top-titles.filter[0]=watermark
-top-titles.filter[0].resource=colour:0x000000
-top-titles.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
-top-titles.filter[0].composite.titles=1
-top-titles.filter[1]=watermark
-top-titles.filter[1].resource=pango:
-top-titles.filter[1].producer.markup=Shotcut
-top-titles.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
-top-titles.filter[1].composite.halign=centre
-top-titles.filter[1].composite.titles=1
+.description=Top Titles
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=5%,5%:90%x20%
+.filter[0]=watermark
+.filter[0].resource=colour:0x000000
+.filter[0].composite.geometry=0%,0%:100%x100%:0;5=0%,0%:100%x100%:40
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=Shotcut
+.filter[1].composite.geometry=0%,0%:100%x100%:0;8=0%,0%:100%x100%:100
+.filter[1].composite.halign=centre
+.filter[1].composite.titles=1
 
 #
 # OK - Silly example...
 #
 
 tickertape=region
-tickertape.description=Tickertape
-tickertape.properties.markup=filter[1].producer.markup
-tickertape.type.markup=text
-tickertape.properties.length[0]=filter[1].composite.out
-tickertape.composite.geometry=0%,93%:100%x7%
-tickertape.filter[0]=watermark
-tickertape.filter[0].resource=colour:0x000000
-tickertape.filter[0].composite.geometry=0%,0%:100%x100%:100
-tickertape.filter[0].composite.titles=1
-tickertape.filter[1]=watermark
-tickertape.filter[1].resource=pango:
-tickertape.filter[1].producer.markup=Shotcut
-tickertape.filter[1].composite.geometry=100%,0%:300%x100%:100;-1=-300%,0%:300%x100%:100
-tickertape.filter[1].producer.font=San 32
-tickertape.filter[1].composite.titles=1
+.description=Tickertape
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.properties.length[0]=filter[1].composite.out
+.composite.geometry=0%,93%:100%x7%
+.filter[0]=watermark
+.filter[0].resource=colour:0x000000
+.filter[0].composite.geometry=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=Shotcut
+.filter[1].composite.geometry=100%,0%:300%x100%:100;-1=-300%,0%:300%x100%:100
+.filter[1].producer.font=San 32
+.filter[1].composite.titles=1
 
 #
 # ETV Location
 #
 
 location=region
-location.description=Titles
-location.properties.markup=filter[1].producer.markup
-location.type.markup=text
-location.period=2
-location.properties.length[0]=filter[0].composite.out
-location.properties.length[1]=filter[1].composite.out
-location.composite.geometry=0,80:230x30
-location.filter[0]=watermark
-location.filter[0].resource=colour:0x6c010100
-location.filter[0].composite.geometry=-100%,0%:100%x100%:100;25=0%,0%:100%x100%:100
-location.filter[0].composite.titles=1
-location.filter[1]=watermark
-location.filter[1].resource=pango:
-location.filter[1].producer.markup=
-location.filter[1].producer.font=San 24
-location.filter[1].composite.geometry=0%,0%:100%x100%:0;24=0%,0%:100%x100%:0;49=0%,0%:100%x100%:100
-location.filter[1].composite.titles=1
-location.filter[1].composite.halign=right
-location.filter[1].composite.valign=center
+.description=Titles
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=0,80:230x30
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=-100%,0%:100%x100%:100;25=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=
+.filter[1].producer.font=San 24
+.filter[1].composite.geometry=0%,0%:100%x100%:0;24=0%,0%:100%x100%:0;49=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
+.filter[1].composite.halign=right
+.filter[1].composite.valign=center
 
 courtesy=region
-courtesy.description=Titles
-courtesy.properties.markup=filter[1].producer.markup
-courtesy.type.markup=text
-courtesy.period=2
-courtesy.properties.length[0]=filter[0].composite.out
-courtesy.properties.length[1]=filter[1].composite.out
-courtesy.composite.geometry=0,115:230x30
-courtesy.filter[0]=watermark
-courtesy.filter[0].resource=colour:0x6c010100
-courtesy.filter[0].composite.geometry=-100%,0%:100%x100%:0;12=-100%,0%:100%x100%:0;37=0%,0%:100%x100%:100
-courtesy.filter[0].composite.titles=1
-courtesy.filter[1]=watermark
-courtesy.filter[1].resource=pango:
-courtesy.filter[1].producer.markup=ETV Exclusive
-courtesy.filter[1].producer.font=San 24
-courtesy.filter[1].composite.geometry=0%,0%:100%x100%:0;37=0%,0%:100%x100%:0;61=0%,0%:100%x100%:100
-courtesy.filter[1].composite.titles=1
-courtesy.filter[1].composite.halign=right
-courtesy.filter[1].composite.valign=right
+.description=Titles
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=0,115:230x30
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=-100%,0%:100%x100%:0;12=-100%,0%:100%x100%:0;37=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=ETV Exclusive
+.filter[1].producer.font=San 24
+.filter[1].composite.geometry=0%,0%:100%x100%:0;37=0%,0%:100%x100%:0;61=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
+.filter[1].composite.halign=right
+.filter[1].composite.valign=right
 
 exclusive=region
-exclusive.description=Exclusive
-exclusive.period=2
-exclusive.properties.length[0]=filter[0].composite.out
-exclusive.properties.length[1]=filter[1].composite.out
-exclusive.composite.geometry=0,115:230x30
-exclusive.filter[0]=watermark
-exclusive.filter[0].resource=colour:0x6c010100
-exclusive.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-exclusive.filter[0].composite.titles=1
-exclusive.filter[1]=watermark
-exclusive.filter[1].resource=pango:
-exclusive.filter[1].producer.markup=ETV Exclusive
-exclusive.filter[1].producer.font=San 24
-exclusive.filter[1].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-exclusive.filter[1].composite.titles=1
-exclusive.filter[1].composite.halign=right
-exclusive.filter[1].composite.valign=right
+.description=Exclusive
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=0,115:230x30
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=ETV Exclusive
+.filter[1].producer.font=San 24
+.filter[1].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
+.filter[1].composite.halign=right
+.filter[1].composite.valign=right
 
 file_shot=region
-file_shot.description=Titles
-file_shot.period=2
-file_shot.properties.length[0]=filter[0].composite.out
-file_shot.properties.length[1]=filter[1].composite.out
-file_shot.composite.geometry=590,160:80x25
-file_shot.filter[0]=watermark
-file_shot.filter[0].resource=colour:0x6c010100
-file_shot.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-file_shot.filter[0].composite.titles=1
-file_shot.filter[1]=watermark
-file_shot.filter[1].resource=pango:
-file_shot.filter[1].producer.markup=File Shot
-file_shot.filter[1].producer.font=San 20
-file_shot.filter[1].composite.geometry=1%,1%:99%x99%:15;25=1%,1%:99%x99%:100
-file_shot.filter[1].composite.titles=0
-file_shot.filter[1].composite.halign=centre
-file_shot.filter[1].composite.valign=centre
+.description=Titles
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=590,160:80x25
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=File Shot
+.filter[1].producer.font=San 20
+.filter[1].composite.geometry=1%,1%:99%x99%:15;25=1%,1%:99%x99%:100
+.filter[1].composite.titles=0
+.filter[1].composite.halign=centre
+.filter[1].composite.valign=centre
 
 special=region
-special.description=Titles
-special.period=2
-special.properties.length[0]=filter[0].composite.out
-special.properties.length[1]=filter[1].composite.out
-special.composite.geometry=465,375:255x35
-special.filter[0]=watermark
-special.filter[0].resource=colour:0x6c010100
-special.filter[0].composite.geometry=100%,0%:100%x100%:0;49=100%,0%:100%x100%:0;74=0%,0%:100%x100%:100
-special.filter[0].composite.titles=1
-special.filter[1]=watermark
-special.filter[1].resource=pango:
-special.filter[1].producer.markup=Special
-special.filter[1].producer.font=San 24
-special.filter[1].composite.geometry=100%,0%:100%x100%:0;49=100%,0%:100%x100%:0;74=0%,0%:100%x100%:100
-special.filter[1].composite.titles=1
-special.filter[1].composite.halign=centre
-special.filter[1].composite.valign=centre
+.description=Titles
+.period=2
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.composite.geometry=465,375:255x35
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=100%,0%:100%x100%:0;49=100%,0%:100%x100%:0;74=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=Special
+.filter[1].producer.font=San 24
+.filter[1].composite.geometry=100%,0%:100%x100%:0;49=100%,0%:100%x100%:0;74=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
+.filter[1].composite.halign=centre
+.filter[1].composite.valign=centre
 
 ticker=region
-ticker.description=Tickertape
-ticker.properties.markup=filter[1].producer.markup
-ticker.type.markup=text
-ticker.properties.length[0]=filter[1].composite.out
-ticker.composite.geometry=0,500:722x75
-ticker.filter[0]=watermark
-ticker.filter[0].resource=colour:0x6c010100
-ticker.filter[0].composite.geometry=0%,0%:100%x100%:100
-ticker.filter[0].composite.titles=1
-ticker.filter[1]=watermark
-ticker.filter[1].resource=pango:
-ticker.filter[1].producer.markup=Ticker - provided for reference
-ticker.filter[1].composite.geometry=0%,0%:100%x100%:100
-ticker.filter[1].composite.titles=0
-ticker.filter[1].producer.font=San 24
-ticker.filter[1].composite.halign=centre
-ticker.filter[1].composite.titles=1
-ticker.filter[1].composite.valign=centre
+.description=Tickertape
+.properties.markup=filter[1].producer.markup
+.type.markup=text
+.properties.length[0]=filter[1].composite.out
+.composite.geometry=0,500:722x75
+.filter[0]=watermark
+.filter[0].resource=colour:0x6c010100
+.filter[0].composite.geometry=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=Ticker - provided for reference
+.filter[1].composite.geometry=0%,0%:100%x100%:100
+.filter[1].composite.titles=0
+.filter[1].producer.font=San 24
+.filter[1].composite.halign=centre
+.filter[1].composite.titles=1
+.filter[1].composite.valign=centre
 
 super=region
-super.description=Transcription
-super.properties.0=filter[1].producer.markup
-super.properties.1=filter[2].producer.markup
-super.properties.align=filter[1].composite.valign
-super.properties.length[0]=filter[0].composite.out
-super.properties.length[1]=filter[1].composite.out
-super.properties.length[2]=filter[2].composite.out
-super.period=2
-super.composite.geometry=0,410:720x90
-super.filter[0]=watermark
-super.filter[0].resource=colour:0xbbbbbb00
-super.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-super.filter[0].composite.titles=1
-super.filter[1]=watermark
-super.filter[1].resource=pango:
-super.filter[1].producer.markup=
-super.filter[1].producer.font=San 32
-super.filter[1].producer.fgcolour=0x6c0101ff
-super.filter[1].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-super.filter[1].composite.titles=1
-super.filter[1].composite.halign=centre
-super.filter[1].composite.valign=top
-super.filter[2]=watermark
-super.filter[2].resource=pango:
-super.filter[2].producer.markup=
-super.filter[2].producer.font=San 32
-super.filter[2].producer.fgcolour=0x6c0101ff
-super.filter[2].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
-super.filter[2].composite.titles=1
-super.filter[2].composite.halign=centre
-super.filter[2].composite.valign=bottom
+.description=Transcription
+.properties.0=filter[1].producer.markup
+.properties.1=filter[2].producer.markup
+.properties.align=filter[1].composite.valign
+.properties.length[0]=filter[0].composite.out
+.properties.length[1]=filter[1].composite.out
+.properties.length[2]=filter[2].composite.out
+.period=2
+.composite.geometry=0,410:720x90
+.filter[0]=watermark
+.filter[0].resource=colour:0xbbbbbb00
+.filter[0].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[0].composite.titles=1
+.filter[0].composite.luma=%luma18.pgm
+.filter[0].composite.out=25
+.filter[1]=watermark
+.filter[1].resource=pango:
+.filter[1].producer.markup=
+.filter[1].producer.font=San 32
+.filter[1].producer.fgcolour=0x6c0101ff
+.filter[1].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[1].composite.titles=1
+.filter[1].composite.halign=centre
+.filter[1].composite.valign=top
+.filter[2]=watermark
+.filter[2].resource=pango:
+.filter[2].producer.markup=
+.filter[2].producer.font=San 32
+.filter[2].producer.fgcolour=0x6c0101ff
+.filter[2].composite.geometry=0%,0%:100%x100%:10;25=0%,0%:100%x100%:100
+.filter[2].composite.titles=1
+.filter[2].composite.halign=centre
+.filter[2].composite.valign=bottom
 
 obscure=region
-obscure.description=Obscure
-obscure.properties.geometry=composite.geometry
-obscure.properties.resource=resource
-obscure.properties.length[0]=composite.out
-obscure.composite.geometry=
-obscure.resource=rectangle
-obscure.composite.refresh=1
-obscure.filter[0]=obscure
-obscure.filter[0].start=0,0:100%x100%
+.description=Obscure
+.properties.geometry=composite.geometry
+.properties.resource=resource
+.properties.length[0]=composite.out
+.composite.geometry=
+.resource=rectangle
+.composite.refresh=1
+.filter[0]=obscure
+.filter[0].start=0,0:100%x100%