GPL checking (provisional implementation), mc scaling docs

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

diff --git a/configure b/configure
index 073f858c7eeb0b9adf8d641b3f0dfd2a50904240..b9edcab45ab7fb4254459323eb8a61912e55a14f 100755 (executable)
--- a/configure
+++ b/configure
@@ -5,20 +5,21 @@ function show_help
        cat << EOF
 Funky non-autotool config script for MLT.
 
-       Options are:
-
-       --help                  - this information
-       --prefix=directory      - install prefix for path (default: $prefix)
-       --disable-debug         - Compile without debug support (default: on)
-       --disable-mmx           - Compile without MMX support (default: on)
-       --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
+Options are:
+
+  --help                  - this information
+  --prefix=directory      - install prefix for path (default: $prefix)
+  --disable-debug         - Compile without debug support (default: on)
+  --disable-mmx           - Compile without MMX support (default: on)
+  --enable-gpl            - Enable GPL components
+  --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
 EOF
 
        for i in src/modules/*
        do
-               [ -d $i ] && [ "`basename $i`" != "CVS" ] && basename $i
+               [ -d $i ] && [ "`basename $i`" != "CVS" ] && echo `basename $i` `[ -f $i/gpl ] && echo [GPL]`
        done |
-       awk '{ printf( "   --disable-%-14.14s- Disable the %s module\n", $1, $1 ); }'
+       awk '{ printf( "  --disable-%-14.14s- Disable the %s module %s\n", $1, $1, $2 ); }'
 
        echo
 }
@@ -86,6 +87,7 @@ export help=0
 export version=0.0.3
 export debug=true
 export mmx=true
+export gpl=false
 export cpu=
 
 # Iterate through arguments
@@ -96,6 +98,7 @@ do
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
+               --enable-gpl )          gpl=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -118,3 +121,10 @@ done
 
 # Build the pkg-config files
 build_pkgconfig
+
+# Report GPL Usage
+[ $help != 1 ] && 
+( [ "$gpl" = "false" ] && 
+echo "GPL Components are disabled" || 
+echo "GPL License Used" )
+

diff --git a/docs/services.txt b/docs/services.txt
index c0742065e953e673af4a27ef59d166349fb89c7d..b69dbb89efe8578a08ead23edf7993f7041ead1a 100644 (file)
--- a/docs/services.txt
+++ b/docs/services.txt
@@ -691,6 +691,46 @@ Filters
 
                none
            
+       gtkrescale
+
+           Description
+
+               Scale the producer video frame size to match the consumer.
+               This filter is designed for use as a Fezzik normaliser.
+
+           Constructor Argument
+
+               interpolation - the rescaling method, one of:
+                   nearest (lowest quality, fastest),
+                   tiles,
+                   bilinear (default; good quality, moderate speed),
+                   hyper (best quality, slowest).
+
+           Initialisation Properties
+
+               int in - in point
+               int out - out point
+
+           Mutable Properties
+
+               string interpolation - see constructor argument above
+
+               If a property "consumer_aspect_ratio" exists on the frame, then
+               rescaler normalises the producer's aspect ratio and maximises the
+               size of the frame, but may not produce the consumer's requested
+               dimension. Therefore, this option works best in conjunction with the
+               resize filter. This behavior can be disabled by another service by
+               either removing the property, setting it to zero, or setting
+               frame property "distort" to 1.
+
+           Dependencies
+
+               libgdk_pixbuf-2.0, libglib-2.0, libgobject-2.0, libgmodule-2.0
+
+           Known Bugs
+
+               none
+
        luma
        
            Description
@@ -730,6 +770,44 @@ Filters
            
                none
            
+       mcrescale
+
+           Description
+
+               Scale the producer video frame size to match the consumer.
+               This filter is designed for use as a Fezzik normaliser.
+
+           Constructor Argument
+
+               interpolation - the rescaling method, one of:
+                   nearest (lowest quality, fastest),
+                   bilinear (default; good quality, moderate speed),
+                   hyper (best quality, slowest).
+
+           Initialisation Properties
+
+               int in - in point
+               int out - out point
+
+           Mutable Properties
+
+               string interpolation - see constructor argument above
+
+               If a property "consumer_aspect_ratio" exists on the frame, then
+               rescaler normalises the producer's aspect ratio and maximises the
+               size of the frame, but may not produce the consumer's requested
+               dimension. Therefore, this option works best in conjunction with the
+               resize filter. This behavior can be disabled by another service by
+               either removing the property, setting it to zero, or setting
+               frame property "distort" to 1.
+
+           Dependencies
+
+               the mainconcept rescaling sdk.
+
+           Known Bugs
+
+               none
        
        mirror
        
@@ -798,7 +876,7 @@ Filters
        
            Description
            
-               Apply one or filters to a region of the video image. The region
+               Apply one or more filters to a region of the video image. The region
                can be shaped as well using the alpha channel of another producer.
                
            Constructor Argument
@@ -864,16 +942,11 @@ Filters
            Description
 
                Scale the producer video frame size to match the consumer.
-               This filter is automatically invoked by Fezzik in order to normalise
-               sample aspect ratio.
+               This filter is designed for use as a Fezzik normaliser.
 
            Constructor Argument
 
-               interpolation - the rescaling method, one of:
-                   nearest (lowest quality, fastest),
-                   tiles,
-                   bilinear (default; good quality, moderate speed),
-                   hyper (best quality, slowest).
+               None.
 
            Initialisation Properties
 
@@ -882,8 +955,6 @@ Filters
 
            Mutable Properties
 
-               string interpolation - see constructor argument above
-
                If a property "consumer_aspect_ratio" exists on the frame, then
                rescaler normalises the producer's aspect ratio and maximises the
                size of the frame, but may not produce the consumer's requested
@@ -894,11 +965,12 @@ Filters
 
            Dependencies
 
-               libgdk_pixbuf-2.0, libglib-2.0, libgobject-2.0, libgmodule-2.0
+               none
 
            Known Bugs
 
-               none
+               none but... it only implements a nearest neighbour scaling - it is
+                       used as the base class for the gtkrescale and mcrescale filters.
 
        resize
        

diff --git a/setenv b/setenv
index 68db10a422c19d64e6a4d7423542576fe6cfff78..23eac179e5b4feab7d2471cea954e380b9f0148d 100644 (file)
--- a/setenv
+++ b/setenv
@@ -10,7 +10,8 @@ export LD_LIBRARY_PATH=\
 `pwd`/src/modules/bluefish:\
 `pwd`/../bluefish/lib:\
 `pwd`/../mpeg_sdk_release/bin:\
-`pwd`/../dvcpro_sdk_release/lib
+`pwd`/../dvcpro_sdk_release/lib:\
+`pwd`/../sr_sdk_release
 
 export PATH=\
 `pwd`/src/albino:\