X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=docs%2Fservices.txt;h=6500f5ff831ca600b64f7a965812408c46a6986d;hb=9ab18ed63c37a9ef65e06697ae25f5c198d788bb;hp=4fde29a8ed0f392f1456b128d4f63c2deb4131c7;hpb=978543a20e47302b82bc29007852bff8180031c2;p=melted

diff --git a/docs/services.txt b/docs/services.txt
index 4fde29a..6500f5f 100644
--- a/docs/services.txt
+++ b/docs/services.txt
@@ -28,18 +28,8 @@ Producers
 			ffmpeg must be configured as --enable-shared and installed prior
 			to compilation of mlt.
 
-		Oddities
-
-			There seems to be a discrepancy between audio and video pts (time
-			stamps) which causes audio seeking to be unreliable in some cases.
-			If audio playback is broken, try adding discrepancy=3 as a
-			property.
-
-			Not sure of the exact reasons, but am investigating. 
-
 		Known Bugs
 
-			Fixed frame rate.
 			Audio sync discrepancy with some content.
 			Not all libavformat supported formats are seekable.
 			ogg is currently broken.
@@ -563,6 +553,72 @@ Filters
 
 			none
 
+	resample
+
+		Description
+
+			Adjust an audio stream's sampling rate
+
+		Constructor Argument
+
+			frequency - a numeric value for the new sample rate
+
+		Initialisation Properties
+
+			int in - in point
+			int out - out point
+
+		Mutable Properties
+
+			int frequency - the target sample rate
+
+		Dependencies
+
+			libresample
+
+		Known Bugs
+
+			none
+
+	rescale
+
+		Description
+
+			Scale the producer video frame size to match the consumer.
+
+		Constructor Argument
+
+			interpolation - the rescaling method, one of:
+				nearest (lowest quality, fastest),
+				tiles,
+				bilinear (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
+
 	volume
 
 		Description
@@ -619,67 +675,32 @@ Filters
 
 			none
 
-	resample
+	watermark
 
 		Description
 
-			Adjust an audio stream's sampling rate
+			Add a watermark to the frames.
 
 		Constructor Argument
 
-			frequency - a numeric value for the new sample rate
+			resource - the producer to use (ie: a .png)
 
 		Initialisation Properties
 
+			string resource - the producer to use
+			string factory - producer required for the resource ('fezzik')
+			string geometry - composite geometry
+			string distort - control scaling
 			int in - in point
 			int out - out point
 
 		Mutable Properties
 
-			int frequency - the target sample rate
-
-		Dependencies
-
-			libresample
-
-		Known Bugs
-
 			none
 
-	rescale
-
-		Description
-
-			Scale the producer video frame size to match the consumer.
-
-		Constructor Argument
-
-			interpolation - the rescaling method, one of:
-				nearest (lowest quality, fastest),
-				tiles,
-				bilinear (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
+			mlt core modules and optionally, fezzik
 
 		Known Bugs