update from GPAC master

Author: rbouqueau

docs/Filters/avmix.md

@@ -192,6 +192,22 @@ When reloading the playlist:
 
 ### Notes  
 
+The special URL scheme `ipid://` can be used to locate an input pid by link directives.  
+Example
+```
+in=ipid://#foo=bar
+```  
+This will use pids having property `foo` with value `bar`, regardless of source filter ID.  
+  
+Example
+```
+in=ipid://TEST#foo=bar
+```  
+This will use pids having property `foo` with value `bar` coming from filter with ID `TEST`.  
+  
+When using the `ipid://` scheme, filter chains cannot be specified (in accepts a single argument) and `port` is ignored.  
+The syntax for link directive is the same as in gpac. However, if a listed property is not found on the input pid, the matching will fail.  
+  
 When launching a child process, the input filter is created first and the child process launched afterwards.  
 
 __Warning: When launching a child process directly (e.g. `in="ffmpeg ..."`), any relative URL used in `in` must be relative to the current working directory.__  
@@ -624,45 +640,6 @@ Example
 
 # Scene modules  
 
-## Scene `mask`  
-This scene sets the canvas alpha mask mode.  
-  
-The canvas alpha mask is always full screen.  
-  
-In software mode, combining mask effect in record mode and reverse group drawing allows drawing front to back while writing pixels only once.  
-  
-Options:  
-* mode ('off'): if set, reset clipper otherwise set it to scene position and size  
-  * off: mask is disabled  
-  * on: mask is enabled and cleared, further draw operations will take place on mask  
-  * onkeep: mask is enabled but not cleared, further draw operations will take place on mask  
-  * use: mask is enabled, further draw operations will be filtered by mask  
-  * use_inv: mask is enabled, further draw operations will be filtered by 1-mask  
-  * rec: mask is in record mode, further draw operations will be drawn on output and will set mask value to 0   
-   
-
-## Scene `clear`  
-This scene clears the canvas area covered by the scene with a given color.   
-  
-The default clear color of the mixer is `black`.  
-  
-The clear area is always axis-aligned in output frame, so when skew/rotation are present, the axis-aligned bounding box of the transformed scene area will be cleared.  
-  
-Options:  
-* color ('none'): clear color  
-
-## Scene `clip`  
-This scene resets the canvas clipper or sets the canvas clipper to the scene area.  
-  
-The clipper is always axis-aligned in output frame, so when skew/rotation are present, the axis-aligned bounding box of the transformed clipper will be used.  
-  
-Clippers are handled through a stack, resetting the clipper pops the stack and restores previous clipper.  
-If a clipper is already defined when setting the clipper, the clipper set is the intersection of the two clippers.  
-  
-Options:  
-* reset (false): if set, reset clipper otherwise set it to scene position and size  
-* stack (true): if false, clipper is set/reset independently of the clipper stack (no intersection, no push/pop of the stack)  
-
 ## Scene `shape`  
 This scene can be used to setup a shape, its outline and specify the fill and strike modes.  
 Supported shapes include:  
@@ -848,13 +825,55 @@ Options:
 * rs_rep (false): same as `rs` for local image in replace mode  
 * rt_rep (false): same as `rt` for local image in replace mode  
 
+## Scene `mask`  
+This scene sets the canvas alpha mask mode.  
+  
+The canvas alpha mask is always full screen.  
+  
+In software mode, combining mask effect in record mode and reverse group drawing allows drawing front to back while writing pixels only once.  
+  
+Options:  
+* mode ('off'): if set, reset clipper otherwise set it to scene position and size  
+  * off: mask is disabled  
+  * on: mask is enabled and cleared, further draw operations will take place on mask  
+  * onkeep: mask is enabled but not cleared, further draw operations will take place on mask  
+  * use: mask is enabled, further draw operations will be filtered by mask  
+  * use_inv: mask is enabled, further draw operations will be filtered by 1-mask  
+  * rec: mask is in record mode, further draw operations will be drawn on output and will set mask value to 0   
+   
+
+## Scene `clear`  
+This scene clears the canvas area covered by the scene with a given color.   
+  
+The default clear color of the mixer is `black`.  
+  
+The clear area is always axis-aligned in output frame, so when skew/rotation are present, the axis-aligned bounding box of the transformed scene area will be cleared.  
+  
+Options:  
+* color ('none'): clear color  
+
+## Scene `clip`  
+This scene resets the canvas clipper or sets the canvas clipper to the scene area.  
+  
+The clipper is always axis-aligned in output frame, so when skew/rotation are present, the axis-aligned bounding box of the transformed clipper will be used.  
+  
+Clippers are handled through a stack, resetting the clipper pops the stack and restores previous clipper.  
+If a clipper is already defined when setting the clipper, the clipper set is the intersection of the two clippers.  
+  
+Options:  
+* reset (false): if set, reset clipper otherwise set it to scene position and size  
+* stack (true): if false, clipper is set/reset independently of the clipper stack (no intersection, no push/pop of the stack)  
+
 # Transition modules  
 
 ## Transition `gltrans` - GPU only  
 This transition module wraps gl-transitions, see https://gl-transitions.com/ and `gpac -h avmix:gltrans` for builtin transitions  
 Options:  
 * fx (''): effect name for built-in effects, or path to gl-transition GLSL file  
 
+## Transition `mix` - software/GPU  
+This transition performs cross-fade of source videos  
+
 ## Transition `swipe` - software/GPU  
 This transition performs simple 2D affine transformations for source videos transitions, with configurable effect origin  
 Options:  
@@ -875,9 +894,6 @@ Options:
   * grow: video 2 size increases, video 1 not modified  
   * swap: video 2 size increases, video 1 size decreases  
 
-## Transition `mix` - software/GPU  
-This transition performs cross-fade of source videos  
-
 ## Transition `fade` - software/GPU  
 This transition performs fade to/from color of source videos  
 Options:  

docs/Filters/bsrw.md

@@ -32,9 +32,12 @@ The filter will work in passthrough mode for all other codecs and media types.
 
 # Options    
 
-<a id="cprim">__cprim__</a> (cprm, default: _-1_, minmax: reserved0,BT709,undef,reserved3,BT470M,BT470G,SMPTE170,SMPTE240,FILM,BT2020,SMPTE428,SMPTE431,SMPTE432,EBU3213, updatable): color primaries according to ISO/IEC 23001-8 / 23091-2  
-<a id="ctfc">__ctfc__</a> (ctfc, default: _-1_, minmax: reserved0,BT709,undef,reserved3,BT470M,BT470BG,SMPTE170,SMPTE249,Linear,Log100,Log316,IEC61966,BT1361,sRGB,BT2020_10,BT2020_12,SMPTE2084,SMPTE428,STDB67, updatable): color transfer characteristics according to ISO/IEC 23001-8 / 23091-2  
-<a id="cmx">__cmx__</a> (cmxc, default: _-1_, minmax: GBR,BT709,undef,FCC,BT601,SMPTE170,SMPTE240,YCgCo,BT2020,BT2020cl,YDzDx, updatable): color matrix coeficients according to ISO/IEC 23001-8 / 23091-2  
+<a id="cprim">__cprim__</a> (cprm, default: _-1_, Enum: reserved0|BT709|undef|reserved3|BT470M|BT470G|SMPTE170|SMPTE240|FILM|BT2020|SMPTE428|SMPTE431|SMPTE432|EBU3213, updatable): color primaries according to ISO/IEC 23001-8 / 23091-2  
+  
+<a id="ctfc">__ctfc__</a> (ctfc, default: _-1_, Enum: reserved0|BT709|undef|reserved3|BT470M|BT470BG|SMPTE170|SMPTE249|Linear|Log100|Log316|IEC61966|BT1361|sRGB|BT2020_10|BT2020_12|SMPTE2084|SMPTE428|STDB67, updatable): color transfer characteristics according to ISO/IEC 23001-8 / 23091-2  
+  
+<a id="cmx">__cmx__</a> (cmxc, default: _-1_, Enum: GBR|BT709|undef|FCC|BT601|SMPTE170|SMPTE240|YCgCo|BT2020|BT2020cl|YDzDx, updatable): color matrix coeficients according to ISO/IEC 23001-8 / 23091-2  
+  
 <a id="sar">__sar__</a> (frac, default: _-1/-1_, updatable): aspect ratio to rewrite  
 <a id="m4vpl">__m4vpl__</a> (sint, default: _-1_, updatable): set ProfileLevel for MPEG-4 video part two  
 <a id="fullrange">__fullrange__</a> (bool, default: _false_, updatable): video full range flag  

docs/Filters/cdcrypt.md

@@ -9,23 +9,22 @@ The CENC decryptor supports decrypting CENC, ISMA, HLS Sample-AES (MPEG2 ts) and
 
 For HLS, key is retrieved according to the key URI in the manifest.  
 Otherwise, the filter uses a configuration file.  
-The syntax is available at https://wiki.gpac.io/Common-Encryption  
+The syntax is available at https://wiki.gpac.io/xmlformats/Common-Encryption  
 The DRM config file can be set per PID using the property `DecryptInfo` (highest priority), `CryptInfo` (lower priority) or set at the filter level using [cfile](#cfile) (lowest priority).  
 When the file is set per PID, the first `CryptInfo` with the same ID is used, otherwise the first `CryptInfo` is used.When the file is set globally (not per PID), the first `CrypTrack` in the DRM config file with the same ID is used, otherwise the first `CrypTrack` with ID 0 or not set is used.  
 
 
 # Options    
 
 <a id="cfile">__cfile__</a> (str): crypt file location  
-<a id="decrypt">__decrypt__</a> (enum, default: _full_): decrypt mode (CENC only)
-
+<a id="decrypt">__decrypt__</a> (enum, default: _full_): decrypt mode (CENC only)  
 * full: decrypt everything, throwing error if keys are not found  
 * nokey: decrypt everything for which a key is found, skip decryption otherwise  
 * skip: decrypt nothing  
 * pad0: decrypt nothing and replace all crypted bits with 0  
 * pad1: decrypt nothing and replace all crypted bits with 1  
-* padsc: decrypt nothing and replace all crypted bytes with start codes 
-
+* padsc: decrypt nothing and replace all crypted bytes with start codes  
+  
 <a id="drop_keys">__drop_keys__</a> (uintl): consider keys with given 1-based indexes as not available (multi-key debug)  
 <a id="kids">__kids__</a> (strl): define KIDs. If `keys` is empty, consider keys with given KID (as hex string) as not available (debug)  
 <a id="keys">__keys__</a> (strl): define key values for each of the specified KID  

docs/Filters/cecrypt.md

@@ -6,7 +6,7 @@ Register name used to load filter: __cecrypt__
 This filter is not checked during graph resolution and needs explicit loading.  
 
 The CENC encryptor supports CENC, ISMA and Adobe encryption. It uses a DRM config file for declaring keys.  
-The syntax is available at https://wiki.gpac.io/Common-Encryption  
+The syntax is available at https://wiki.gpac.io/xmlformats/Common-Encryption  
 The DRM config file can be set per PID using the property `CryptInfo`, or set at the filter level using [cfile](#cfile).  
 When the DRM config file is set per PID, the first `CrypTrack` in the DRM config file with the same ID is used, otherwise the first `CrypTrack` is used (regardless of the `CrypTrack` ID).  
 When the DRM config file is set globally (not per PID), the first `CrypTrack` in the DRM config file with the same ID is used, otherwise the first `CrypTrack` with ID 0 or not set is used.  
@@ -17,4 +17,5 @@ If no DRM config file is defined for a given PID, this PID will not be encrypted
 
 <a id="cfile">__cfile__</a> (str): crypt file location  
 <a id="allc">__allc__</a> (bool): throw error if no DRM config file is found for a PID  
+<a id="bk_stats">__bk_stats__</a> (bool): print number of encrypted blocks to stdout upon exit  
 

docs/Filters/compositor.md

@@ -112,7 +112,8 @@ Whether the setting is applied or not depends on the graphics module and player
 <a id="asr">__asr__</a> (uint, default: _0_): force output sample rate (0 for auto)  
 <a id="ach">__ach__</a> (uint, default: _0_): force output channels (0 for auto)  
 <a id="alayout">__alayout__</a> (uint, default: _0_): force output channel layout (0 for auto)  
-<a id="afmt">__afmt__</a> (afmt, default: _s16_, minmax: none,u8,s16,s16b,s24,s24b,s32,s32b,flt,fltb,dbl,dblb,u8p,s16p,s24p,s32p,fltp,dblp): force output channel format (0 for auto)  
+<a id="afmt">__afmt__</a> (afmt, default: _s16_, Enum: none|u8|s16|s16b|s24|s24b|s32|s32b|flt|fltb|dbl|dblb|u8p|s16p|s24p|s32p|fltp|dblp): force output channel format (0 for auto)  
+  
 <a id="asize">__asize__</a> (uint, default: _1024_): audio output packet size in samples  
 <a id="abuf">__abuf__</a> (uint, default: _100_): audio output buffer duration in ms - the audio renderer fills the output PID up to this value. A too low value will lower latency but can have real-time playback issues  
 <a id="avol">__avol__</a> (uint, default: _100_, updatable): audio volume in percent  
@@ -225,7 +226,8 @@ Whether the setting is applied or not depends on the graphics module and player
 * gui: player mode with GUI auto-start  
 
 <a id="noaudio">__noaudio__</a> (bool, default: _false_): disable audio output  
-<a id="opfmt">__opfmt__</a> (pfmt, default: _none_, minmax: none,yuv420,yvu420,yuv420_10,yuv422,yuv422_10,yuv444,yuv444_10,uyvy,vyuy,yuyv,yvyu,uyvl,vyul,yuyl,yvyl,nv12,nv21,nv1l,nv2l,yuva,yuvd,yuv444a,yuv444p,v308,yuv444ap,v408,v410,v210,grey,algr,gral,rgb4,rgb5,rgb6,rgba,argb,bgra,abgr,rgb,bgr,xrgb,rgbx,xbgr,bgrx,rgbd,rgbds,uncv): pixel format to use for output. Ignored in [player](#player) mode  
+<a id="opfmt">__opfmt__</a> (pfmt, default: _none_, Enum: none|yuv420|yvu420|yuv420_10|yuv422|yuv422_10|yuv444|yuv444_10|uyvy|vyuy|yuyv|yvyu|uyvl|vyul|yuyl|yvyl|nv12|nv21|nv1l|nv2l|yuva|yuvd|yuv444a|yuv444p|v308|yuv444ap|v408|v410|v210|grey|algr|gral|rgb4|rgb5|rgb6|rgba|argb|bgra|abgr|rgb|bgr|xrgb|rgbx|xbgr|bgrx|rgbd|rgbds|uncv): pixel format to use for output. Ignored in [player](#player) mode  
+  
 <a id="drv">__drv__</a> (enum, default: _auto_): indicate if graphics driver should be used  
 * no: never loads a graphics driver, software blit is used, no 3D possible (in player mode, disables OpenGL)  
 * yes: always loads a graphics driver, output pixel format will be RGB (in player mode, same as `auto`)  

docs/Filters/core_options.md

@@ -37,23 +37,25 @@
 <a id="no-fd">__-no-fd__</a>:  use buffered IO instead of file descriptor for read/write - this can speed up operations on small files  
 
 <a id="no-mx">__-no-mx__</a>:  disable all mutexes, threads and semaphores (do not use if unsure about threading used)  
+<a id="xml-max-csize">__-xml-max-csize__</a> (int, default: __100k__): maximum XML content or attribute size  
 <a id="netcap">__-netcap__</a> (string): set packet capture and filtering rules formatted as [CFG][RULES]. Each `-netcap` argument will define a configuration  
 [CFG] is an optional comma-separated list of:  
 * id=ID: ID (string) for this configuration. If NULL, configuration will apply to all sockets not specifying a netcap ID  
 * src=F: read packets from `F`, as produced by GPAC or a pcap or pcapng file  
-* dst=F: output packets to `F` (no pcap/pcapng support), cannot be set if src is set  
+* dst=F: output packets to `F` (GPAC or pcap/pcapng file), cannot be set if src is set  
 * loop[=N]: loop capture file N times, or forever if N is not set or negative  
 * nrt: disable real-time playback  
 [RULES] is an optional list of `[OPT,OPT2...]` with OPT in:  
-* m=N: set rule mode - `N` can be `r` for reception only (default), `w` for send only or `rw` for both  
-* s=N: set packet start range to `N`  
-* e=N: set packet end range to `N` (only used for `r` and `f` rules)  
-* n=N: set number of packets to drop to `N` - not set, 0 or 1 means single packet  
-* r=N: random drop one packet every `N`  
-* f=N: drop first packet every `N`  
-* p=P: local port number to filter, if not set the rule applies to all packets  
-* o=N: patch packet instead of droping (always true for TCP), replacing byte at offset `N` (0 is first byte, <0 for random)  
-* v=N: set patch byte value to `N` (hexa) or negative value for random (default)  
+* m=K: set rule mode - `K` can be `r` for reception only (default), `w` for send only or `rw` for both  
+* s=K: set packet start range to `K`  
+* e=K: set packet end range to `K` - only used for `r` and `f` rules, 0 or not set means rule apply until end  
+* n=K: set number of packets to drop to `K` - not set, 0 or 1 means single packet  
+* r=K: random drop `n` packet every `K`  
+* f=K: drop first `n` packets every `K`  
+* d=K: reorder `n` packets after the next `K` packets, can be used with `f` or `r` rules  
+* p=K: filter packets on port `K` only, if not set the rule applies to all packets  
+* o=K: patch packet instead of droping (always true for TCP), replacing byte at offset `K` (0 is first byte, <0 for random)  
+* v=K: set patch byte value to `K` (hexa) or negative value for random (default)  
 
 Example
 ```
@@ -93,10 +95,7 @@ This will use regular network interface and drop packets 100 to 119 on port 1234
 <a id="dm-threads">__-dm-threads__</a>: force using threads for async download requests rather than session scheduler  
 <a id="cte-rate-wnd">__-cte-rate-wnd__</a> (int, default: __20__): set window analysis length in milliseconds for chunk-transfer encoding rate estimation  
 <a id="cred">__-cred__</a> (string): path to 128 bits key for credential storage  
-<a id="no-h2">__-no-h2__</a>:  disable HTTP2  
-<a id="no-h2c">__-no-h2c__</a>: disable HTTP2 upgrade (i.e. over non-TLS)  
-<a id="h2-copy">__-h2-copy__</a>: enable intermediate copy of data in nghttp2 (default is disabled but may report as broken frames in wireshark)  
-<a id="dbg-edges">__-dbg-edges__</a>: log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status, weight, src_cap_idx, dst_cap_idx)  
+<a id="dbg-edges">__-dbg-edges__</a>: log edges status in filter graph before dijkstra resolution (for debug). Edges are logged as edge_source(status(disable_depth), weight, src_cap_idx -> dst_cap_idx)  
 <a id="full-link">__-full-link__</a>: throw error if any PID in the filter graph cannot be linked  
 <a id="no-dynf">__-no-dynf__</a>: disable dynamically loaded filters  
 <a id="no-block">__-no-block__</a> (Enum, default: __no__): disable blocking mode of filters