From: lilo_booter Date: Sun, 16 Jan 2005 09:25:26 +0000 (+0000) Subject: Minor modifications to compositing options and etv fx X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=bac7cd7749bf743543e2e4f2897bbc1fe3f192c0;p=melted Minor modifications to compositing options and etv fx git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@617 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/demo/mlt_slideshow_black b/demo/mlt_slideshow_black index a9a80f0..ddbf595 100644 --- a/demo/mlt_slideshow_black +++ b/demo/mlt_slideshow_black @@ -1,3 +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 \ +inigo Scotland/.all.jpg ttl=100 \ +-filter watermark:colour:black reverse=1 composite.geometry="15%,15%:10%,10%;0.1625=0,0:100%x100%;-.1625=;-1=70%,70%:10%x10%" composite.mirror_off=1 composite.cycle=100 composite.fill=1 composite.valign=c composite.halign=c \ $* diff --git a/docs/services.txt b/docs/services.txt index b387749..86a9ab6 100644 --- a/docs/services.txt +++ b/docs/services.txt @@ -324,6 +324,7 @@ Producers default "Sans 48". FreeType2 renders at 72 dpi. string encoding - the text encoding type of the input if not UTF-8. - see 'iconv --list' for a list of possible inputs. + int weight - the weight of the font (default is 400) Read Only Properties diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 16bf590..93574a5 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -74,14 +74,16 @@ static void geometry_calculate( mlt_transition this, struct geometry_s *output, { mlt_properties properties = MLT_TRANSITION_PROPERTIES( this ); mlt_geometry geometry = mlt_properties_get_data( properties, "geometries", NULL ); + int mirror_off = mlt_properties_get_int( properties, "mirror_off" ); + int repeat_off = mlt_properties_get_int( properties, "repeat_off" ); int length = mlt_geometry_get_length( geometry ); // Allow wrapping - if ( position >= length && length != 0 ) + if ( !repeat_off && position >= length && length != 0 ) { int section = position / length; position -= section * length; - if ( section % 2 == 1 ) + if ( !mirror_off && section % 2 == 1 ) position = length - position; } diff --git a/src/modules/feeds/PAL/etv.properties b/src/modules/feeds/PAL/etv.properties index 96a6d07..2eaf41c 100644 --- a/src/modules/feeds/PAL/etv.properties +++ b/src/modules/feeds/PAL/etv.properties @@ -18,7 +18,7 @@ location=region .properties.markup=filter[1].producer.markup .period=2 .properties.length[0]=composite.out -.composite.geometry=0,80:230x30:0;24=,:x:100 +.composite.geometry=0,80:230x30:0;12=,:x:100 .composite.luma=%luma01.pgm .composite.softness=.3 .filter[0]=watermark @@ -38,7 +38,7 @@ courtesy=region .type.markup=text .period=2 .properties.length[0]=composite.out -.composite.geometry=0,115:230x30:0;37=,:x:100 +.composite.geometry=0,115:230x30:0;12=,:x:100 .composite.luma=%luma01.pgm .composite.softness=.3 .filter[0]=watermark @@ -58,15 +58,14 @@ exclusive=region .type.markup=text .period=2 .properties.length[0]=composite.out -.composite.geometry=0,115:230x30:0;37=,:x:100 -.composite.luma=%luma01.pgm -.composite.softness=.3 +.composite.geometry=-230,115:230x30;12=0 .filter[0]=watermark .filter[0].resource=colour:0x6c010100 .filter[1]=watermark .filter[1].resource=pango: .filter[1].producer.markup=ETV Exclusive -.filter[1].producer.font=Sans Bold 24 +.filter[1].producer.font=Sans 24 +.filter[1].producer.weight=700 .filter[1].composite.geometry=0,0:95%x100% .filter[1].composite.titles=1 .filter[1].composite.halign=right @@ -76,13 +75,14 @@ file_shot=region .description=Titles .period=2 .properties.length[0]=composite.out -.composite.geometry=590,160:80x25:0;25=,:x:100 +.composite.geometry=590,160:80x25:0;12=,:x:100 .filter[0]=watermark .filter[0].resource=colour:0x6c010100 .filter[1]=watermark .filter[1].resource=pango: .filter[1].producer.markup=File Shot -.filter[1].producer.font=Sans Bold 18 +.filter[1].producer.font=Sans 18 +.filter[1].producer.weight=700 .filter[1].composite.titles=1 .filter[1].composite.halign=centre .filter[1].composite.valign=centre @@ -95,12 +95,13 @@ special=region .composite.geometry=465,375:255x35 .filter[0]=watermark .filter[0].resource=colour:0x6c010101 -.filter[0].composite.geometry=100%,0%:100%x100%:0;24=0%,0%:x:100 +.filter[0].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100 .filter[1]=watermark .filter[1].resource=pango: .filter[1].producer.markup=Special -.filter[1].producer.font=Sans Bold 24 -.filter[1].composite.geometry=100%,0%:100%x100%:0;24=0%,0%:x:100 +.filter[1].producer.font=Sans 24 +.filter[1].producer.weight=700 +.filter[1].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100 .filter[1].composite.titles=1 .filter[1].composite.halign=centre .filter[1].composite.valign=centre @@ -117,7 +118,8 @@ ticker=region .filter[1]=watermark .filter[1].resource=pango: .filter[1].producer.markup=Ticker - provided for reference -.filter[1].producer.font=Sans Bold 24 +.filter[1].producer.font=Sans 24 +.filter[1].producer.weight=700 .filter[1].composite.titles=1 .filter[1].composite.halign=centre .filter[1].composite.valign=centre @@ -127,6 +129,7 @@ super=region .properties.0=filter[1].producer.markup .properties.1=filter[2].producer.markup .properties.align=filter[1].composite.valign +.properties.weight=filter[1].producer.weight .properties.length[0]=composite.out .period=2 .composite.geometry=0,410:720x90:0;25=,:x:100 @@ -139,7 +142,8 @@ super=region .filter[1]=watermark .filter[1].resource=pango: .filter[1].producer.markup= -.filter[1].producer.font=Sans Bold 32 +.filter[1].producer.font=Sans 32 +.filter[1].producer.weight=700 .filter[1].producer.fgcolour=0x6c0101ff .filter[1].composite.titles=1 .filter[1].composite.halign=centre